diff --git a/WinIn.FasterZ.Wms.Fe/README.md b/WinIn.FasterZ.Wms.Fe/README.md
index 4208571d9..e53216fc2 100644
--- a/WinIn.FasterZ.Wms.Fe/README.md
+++ b/WinIn.FasterZ.Wms.Fe/README.md
@@ -123,4 +123,25 @@ validType           type仅等于input时：实时keyUp校验，类型如下：
 pointNumberFixed    组合上方validType值仅等于pointNumber时：
                     小数点后方保留位数,如不填写默认为100位
 <validType>+<pointNumberFixed>示例：
-{ type:"input", label:"金额", prop:"money", validType:'pointNumber',pointNumberFixed:2},
\ No newline at end of file
+{ type:"input", label:"金额", prop:"money", validType:'pointNumber',pointNumberFixed:2},
+
+[urlOpion示例]
+// 添加页面需要配置位置
+// 示例数据
+export const TestSchool = {
+    baseURL:'TestSchool/base',//主表-列表
+    detailURL:'app/test-school',//主表-明细 + 明细-查看主表
+    detailListURL:'TestStudentDetail/base',//明细-列表,
+    // parentURL:null,//明细-查看主表:特殊接口，如果没有则走detailURL
+    // deleteURL:null,//删除特殊URL
+    // addURL:null,//新增特殊URL
+    // editURL:null,//编辑特殊URL
+    // exportURL:'exportURL',//导出特殊URL
+    <!-- 20231124 有主表的子列表 查看详情的主表信息处理 -->
+    //有主表的子表单页的主表信息接口,默认为当前的[detailURL]去掉[-Detail]
+    // mainShowMasterUrl:null,
+    //有主表的子表单页的主表链接参数，默认为[masterId]
+    // mainShowMasterId:'masterId',
+    //有主表的子表单页的主表路由[用于显示列转义]，默认为[当前路由]去掉[Detail]
+    // masterRoute:null,
+}
\ No newline at end of file
diff --git a/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index copy.vue b/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index copy.vue
new file mode 100644
index 000000000..a91bedfc9
--- /dev/null
+++ b/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index copy.vue	
@@ -0,0 +1,367 @@
+<template>
+  <!-- 组件功能：修改布局前版本 参数配置从api获取 -->
+  <el-dialog
+    :visible.sync="show"
+    :modal="false"
+    :modal-append-to-body="false"
+    :show-close="true"
+    @close="close"
+    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="centerInnerContent" :class="{'hasDetails' : flexTableData}">
+        <!-- 左侧主表 -->
+        <div class="leftMainForm">
+          <div class="dialogOuterTitle">{{formTitle}} 【主表信息】</div>
+          <!-- 表单 -->
+          <el-form 
+            class="addEditFrom"
+            ref="addEditFrom_Ref"
+            v-if="formData"
+            :model="formData"
+            :rules="formRules"
+          >
+            <el-row :gutter="40">
+              <el-col
+                :span="item.colSpan || 12"
+                v-for="(item, index) in formItemData"
+                :key="index"
+              >
+                <el-form-item 
+                  :label="item.label"
+                  :prop="item.prop"
+                  v-if="item.label.toUpperCase() != 'DETAILS'"
+                >
+                  <!-- 数值 -->
+                  <el-input-number
+                    v-if="item.apiBaseType === 'number'"
+                    v-model="formData[item.prop]"
+                    :min="item.minimum || undefined"
+                    :max="item.maximum || undefined"
+                    :maxlength="item.maxLength || undefined"
+                    :minlength="item.minLength || undefined"
+                    :disabled="Boolean(item.disabled)"
+                    :placeholder="item.placeholder || '请输入' + item.label"
+                    @change="changeValue(item.prop,item,$event)"
+                    @clear="clearValue(item.prop,$event)"
+                  ></el-input-number>
+
+                  <!-- 时间转换 -->
+                  <el-date-picker
+                    v-else-if="item.apiBaseType === 'datetime'"
+                    v-model="formData[item.prop]"
+                    type="datetime"
+                    placeholder="选择日期时间"
+                    format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-ddTHH:mm:ss"
+                    :disabled="Boolean(item.disabled)"
+                  ></el-date-picker>
+
+                  <!-- 布尔、枚举 -->
+                  <el-select 
+                    v-else-if="item.isEnums || item.apiBaseType === 'boolean'"
+                    v-model="formData[item.prop]" 
+                    :placeholder="item.placeholder || '请选择' + item.label"
+                    :disabled="Boolean(item.disabled)"
+                  >
+                    <el-option
+                      v-for="item in item.enums_list"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+
+                  <!-- 文本框 -->
+                  <!-- <el-input
+                    v-else
+                    type="textarea"
+                    autosize
+                    resize="none"
+                    v-model="formData[item.prop]"
+                    :placeholder="item.placeholder || '请输入' + item.label"
+                    :disabled="Boolean(item.disabled)"
+                  ></el-input> -->
+                  <el-input 
+                    v-else
+                    v-model="formData[item.prop]"
+                    :placeholder="item.placeholder || '请输入' + item.label"
+                    :disabled="Boolean(item.disabled)"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <!-- 右侧子表 -->
+        <div class="rightDetailTable" v-if="flexTableData">
+          <div class="dialogOuterTitle">{{formTitle}} 【子表信息】</div>
+          <currenTableFlex
+            ref="currenTableFlex_Ref"
+            :isShowIndex="true"
+            :isEditable="true"
+            :setUTableHeight="230"
+            class="currenTableFlex"
+            :flexTableData="flexTableData"
+            :flexTableColumns="flexTableColumns"
+          ></currenTableFlex>
+        </div>
+      </div>
+      <!-- 操作按钮 -->
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="show = false">取 消</el-button>
+        <el-button type="primary" @click="submitHandle()">确 定</el-button>
+      </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 { ApiTypePost, ApiTypePut } from "@/api/wms-api"
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import currenTableFlex from "@/components/currenTableFlex"
+import * as allUrlOption from '@/utils/baseData/urlOption'
+export default {
+  name:"addEditFromApiPop",
+  mixins:[ LoadingMixins ],
+  components: { currenTableFlex },
+  props: {
+    // 编辑行数据
+    editRowData:{
+      type: Object,
+      default: null
+    },
+    // 操作类型：add/edit
+    handleType:{
+      type: String,
+      default: null
+    },
+    // 提交事件
+    submitForm:{
+      type:Function,
+      default:null
+    },
+    // 特殊的【新增】接口，如果没有就走路由下的配置文件
+    addSubmitUrl:{
+      type: String,
+      default: null
+    },
+    // 特殊的【编辑】接口，如果没有就走路由下的配置文件
+    editSubmitUrl:{
+      type: String,
+      default: null
+    },
+  },
+  data () {
+    return {
+      //明细-列表
+      URLOption_detailList:allUrlOption[this.$route.name].detailListURL,
+      // 当前的dto
+      currentDtos:this.$store.getters.dtoColumnTypes[this.$route.name],
+      active:0,//显示内容：0表单 1成功 2失败
+      show:true,
+      formTitle:null,//form名称
+      formData:{},//表单数据
+      formItemData:null,//表单item配置
+      formRules: {},//表单验证
+      flexTableData:null,//子表table
+      // flexTableColumns:null,//子表table列
+      flexTableColumns: null,
+    }
+  },
+  mounted(){
+    this.initTitle()
+    this.initFormItems()
+  },
+  methods: {
+    // 初始化form名称
+    initTitle(){
+      if(this.handleType){
+        this.formTitle = this.handleType == 'add' ? '新增'+this.$route.name : '编辑'+this.$route.name
+      }
+    },
+    // 初始化表单配置、rules
+    initFormItems(){
+      let _dtoList_type = this.handleType == 'add' ? 'C' : 'U'
+      let _dtoList = this.currentDtos[_dtoList_type].dtoList
+      // 除去子表信息
+      let _formItems = _dtoList.filter(item=>{
+        return item.prop.toUpperCase() != 'DETAILS'
+      })
+      if(_formItems)this.formItemData = _formItems
+      // 编辑格式：特殊处理默认值
+      if(this.handleType == 'edit' && this.editRowData){
+        this.formData = JSON.parse(JSON.stringify(this.editRowData))
+      }else{
+        this.formData = {}
+      }
+      // 子表数据
+      let _list = _dtoList.filter(item=>{
+        return item.prop.toUpperCase() == 'DETAILS'
+      })
+      if(_list && _list.length > 0){
+        if(this.handleType == 'edit'){
+          this.flexTableData = this.formData[_list[0].prop]
+        }else{
+          this.flexTableData = []
+        }
+      }
+      // 子表数据列
+      if(this.URLOption_detailList){
+        let _detailApi = this.URLOption_detailList.slice(0,this.URLOption_detailList.lastIndexOf('/'))
+        let _detailDtos = this.$store.getters.dtoColumnTypes[_detailApi].S.dtoList
+        this.flexTableColumns = _detailDtos
+      }
+
+      // 表单验证格式化
+      this.formRules={}
+      _dtoList.forEach(item=>{
+        if(item.isRequired){
+          this.formRules[item.prop] = [{ required: true, trigger: "blur", message: "不可为空" }]
+        }
+      })
+    },
+    // 关闭弹窗
+    close() {
+      this.show = false
+      this.$emit("closePop")
+    },
+    // 提交表单
+    submitHandle(){
+      this.$refs.addEditFrom_Ref.validate((valid) => {
+        if(this.submitForm){
+          this.submitForm(valid,this.formData,this.handleType,this.formItemData,this.formRules)
+          return
+        }
+        this.formData.details = this.flexTableData
+        this.Loading.addEditApiLoading = true
+        if (valid) {
+          // 新增
+          if(this.handleType == 'add'){
+            ApiTypePost(
+              this.formData, 
+              this.currentDtos.C.actionsUrl
+            ).then(res => {
+              this.changeActive(1)
+            }).catch(err => {
+              this.changeActive(2)
+            })
+          }
+          // 编辑
+          else{
+            ApiTypePut(
+              this.formData, 
+              this.formData.id, 
+              this.currentDtos.U.actionsUrl
+            ).then(res => {
+              this.changeActive(1)
+            }).catch(err => {
+              this.changeActive(2)
+            })
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    // 结果页退出
+    exitHandle(){
+      this.close()
+      if(this.active == '1')this.oldSkipCount = 1;
+      this.show = false
+      this.$emit("exitAfterHandle")
+      this.$nextTick(()=>{
+        this.active = 0
+      })
+    },
+    // 更改页面步骤
+    changeActive(sta){
+      this.active = sta
+      this.Loading.addEditApiLoading = false
+    },
+    // 值更改函数
+    changeValue(prop,item,val) {
+      this.$emit("changeValue", prop, item, val)
+    },
+    // 值清除函数
+    clearValue(prop,item,val) {
+      this.$emit("clearValue", prop, item, val)
+    },
+  }
+}
+</script>
+    
+<style  lang="scss" scoped>
+  ::v-deep .el-dialog__header{
+    padding:  0 !important;
+  }
+  ::v-deep .el-row{
+    width: 100%;
+  }
+  ::v-deep .addEditFrom{
+    height: calc(100%);
+    overflow: auto;
+  }
+  ::v-deep .el-form-item__label{
+    float: unset;
+  }
+
+  ::v-deep .el-input,.el-select,.el-input-number{
+    width: 100% !important;
+  }
+
+  .dialog-footer{
+    padding-top: 15px;
+    text-align: right;
+  }
+  .centerInnerContent{
+    height: calc(100% - 60px);
+    overflow: auto;
+
+    .leftMainForm{
+      height: calc(100% - 60px);
+    }
+
+    &.hasDetails{
+      display: flex;
+
+      .leftMainForm{
+        width: 50%;
+        flex-shrink: 0;
+      }
+
+      .rightDetailTable{
+        height: calc(100% - 60px);
+        width: calc(50%);
+        padding-left:40px;
+        border-left: #ddd solid 1px;
+      }
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index.vue b/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index.vue
index 29fb3b690..ed541aace 100644
--- a/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index.vue
@@ -1,10 +1,10 @@
 <template>
-  <!-- 组件功能：普通新增编辑（目前只有主表）参数配置从api获取 -->
+  <!-- 组件功能：新增编辑（含有主子表）参数配置从api获取 -->
   <el-dialog
     :visible.sync="show"
     :modal="false"
     :modal-append-to-body="false"
-    :show-close="true"
+    :show-close="false"
     @close="close"
     class="searchPageComponents"
     :fullscreen="true"
@@ -13,10 +13,15 @@
   >
     <!-- 数据填写 -->
     <div v-if="active === 0" style="height: 100%;">
-      <div class="centerInnerContent" :class="{'hasDetails' : flexTableData}">
-        <!-- 左侧主表 -->
+      <div class="centerInnerContent">
+        <!-- 主表 -->
         <div class="leftMainForm">
-          <div class="dialogOuterTitle">{{formTitle}} 【主表信息】</div>
+          <div class="dialogOuterTitle">
+            {{formTitle}} <span v-if="isHaveDetail()">【主表信息】</span>
+            <div class="buttonBox" v-if="isHaveDetail()">
+              <el-button @click="detailPopShow = true" size="small" type="warning">编辑子表信息</el-button> 
+            </div>
+          </div>
           <!-- 表单 -->
           <el-form 
             class="addEditFrom"
@@ -97,25 +102,46 @@
             </el-row>
           </el-form>
         </div>
-        <!-- 右侧子表 -->
-        <div class="rightDetailTable" v-if="flexTableData">
+      </div>
+      <!-- 操作按钮 -->
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="show = false">取 消</el-button>
+        <el-button type="primary" @click="submitHandle()">确 定</el-button>
+      </div>
+      
+      <!-- 模拟子表弹窗遮罩层（为处理切换tab消失问题）-->
+      <div class="imitateDetailPopModal" v-if="detailPopShow"></div>
+      <!-- 子表弹窗 -->
+      <el-dialog
+        :visible.sync="detailPopShow"
+        :show-close="false"
+        @close="closeDetailPop"
+        :append-to-body="false"
+        :modal-append-to-body="false"
+        width="95%"
+        top="2vh"
+        class="detailPop"
+        :modal="false"
+      >
+        <div class="rightDetailTable">
           <div class="dialogOuterTitle">{{formTitle}} 【子表信息】</div>
           <currenTableFlex
             ref="currenTableFlex_Ref"
             :isShowIndex="true"
             :isEditable="true"
-            :setUTableHeight="230"
+            :setUTableHeight="290"
             class="currenTableFlex"
             :flexTableData="flexTableData"
             :flexTableColumns="flexTableColumns"
+            :border="true"
           ></currenTableFlex>
         </div>
-      </div>
-      <!-- 操作按钮 -->
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="show = false">取 消</el-button>
-        <el-button type="primary" @click="submitHandle()">确 定</el-button>
-      </div>
+        <!-- 操作按钮 -->
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="closeDetailPop">取 消</el-button>
+          <el-button type="primary" v-if="flexTableData && flexTableData.length > 0" @click="sureDetailHandle()">确 定</el-button>
+        </div>
+      </el-dialog>
     </div>
     <!-- 成功提示 -->
     <div v-if="active === 1">
@@ -190,9 +216,12 @@ export default {
       formData:{},//表单数据
       formItemData:null,//表单item配置
       formRules: {},//表单验证
+      detailPopShow:false,//子表信息弹窗
       flexTableData:null,//子表table
-      // flexTableColumns:null,//子表table列
-      flexTableColumns: null,
+      flexTableData_stag:null,//子表table暂存数据
+      detailFormRules: {},//子表表单验证
+      flexTableColumns:null,//子表table列
+      showDetailRulesTipper:false,//子表规则提示是否正在显示（处理提示重复叠加问题）
     }
   },
   mounted(){
@@ -210,11 +239,13 @@ export default {
     initFormItems(){
       let _dtoList_type = this.handleType == 'add' ? 'C' : 'U'
       let _dtoList = this.currentDtos[_dtoList_type].dtoList
-      // 除去子表信息
-      let _formItems = _dtoList.filter(item=>{
-        return item.prop.toUpperCase() != 'DETAILS'
+      // 主表信息处理 除去【details】字段和【id】字段
+      this.formItemData = []
+      _dtoList.forEach(item=>{
+        if(item.prop.toUpperCase() != "ID" && item.prop.toUpperCase() != 'DETAILS'){
+          this.formItemData.push(item)
+        }
       })
-      if(_formItems)this.formItemData = _formItems
       // 编辑格式：特殊处理默认值
       if(this.handleType == 'edit' && this.editRowData){
         this.formData = JSON.parse(JSON.stringify(this.editRowData))
@@ -222,24 +253,47 @@ export default {
         this.formData = {}
       }
       // 子表数据
-      let _list = _dtoList.filter(item=>{
+      let detail_list = _dtoList.filter(item=>{
         return item.prop.toUpperCase() == 'DETAILS'
       })
-      if(_list && _list.length > 0){
+      if(detail_list && detail_list.length > 0){
         if(this.handleType == 'edit'){
-          this.flexTableData = this.formData[_list[0].prop]
+          this.flexTableData = this.formData[detail_list[0].prop]
         }else{
           this.flexTableData = []
         }
+        this.flexTableData_stag = JSON.parse(JSON.stringify(this.flexTableData))
       }
       // 子表数据列
       if(this.URLOption_detailList){
         let _detailApi = this.URLOption_detailList.slice(0,this.URLOption_detailList.lastIndexOf('/'))
         let _detailDtos = this.$store.getters.dtoColumnTypes[_detailApi].S.dtoList
-        this.flexTableColumns = _detailDtos
+        this.flexTableColumns = []
+        // 子表信息处理 除去【masterId】字段
+        _detailDtos.forEach(item=>{
+          if(item.prop.toUpperCase() != "MASTERID"){
+            this.flexTableColumns.push(item)
+          }
+        })
+
+        // 子表-表单验证格式化
+        // todo:detailFormRules从配置文件格式化验证
+        // this.detailFormRules={}
+        // _detailDtos.forEach(item=>{
+        //   if(item.isRequired){
+        //     this.detailFormRules[item.prop] = [{ required: true, trigger: "blur", message: item.message }]
+        //   }
+        // })
+        this.detailFormRules = {
+          itemCode:[{ required: true, trigger: "blur", message: "不可为空" }],
+          rawQty:[
+            { required: true, trigger: "blur", message: "不可为空" },
+            { valid:(val)=>{return this.numberOverControl(val,1,20)}, trigger: "blur", message: "必须大于0，且小于等于20" }
+          ]
+        }
       }
 
-      // 表单验证格式化
+      // 主表-表单验证格式化
       this.formRules={}
       _dtoList.forEach(item=>{
         if(item.isRequired){
@@ -247,43 +301,134 @@ export default {
         }
       })
     },
+    // 判断是否存在子表
+    isHaveDetail(){
+      let _currentOption = allUrlOption[this.$route.name]
+      return _currentOption.isMaster && _currentOption.hasDetail && this.flexTableData
+    },
     // 关闭弹窗
     close() {
       this.show = false
       this.$emit("closePop")
     },
+    // 关闭子表弹窗
+    closeDetailPop() {
+      this.flexTableData = JSON.parse(JSON.stringify(this.flexTableData_stag))
+      this.detailPopShow = false
+      this.$emit("closeDetailPop")
+    },
+    // 数字值处理
+    numberOverControl(value,min,max){
+      let val = Number(value)
+      if(min && max){ return val >= min && val <= max }
+      if(min && !max){ return val >= min }
+      if(!min && max){ return val <= max }
+    },
+    // 子表确定
+    sureDetailHandle(){
+      let _hasNoVaild = false
+      // 检验规则判断处理
+      for(let i=0;i<this.flexTableData.length;i++){
+        for(let r in this.flexTableData[i]){
+          if(this.detailFormRules[r]){
+            for(let v = 0;v<this.detailFormRules[r].length;v++){
+              // 必填项处理
+              if(
+                this.detailFormRules[r][v].required && 
+                ((!this.flexTableData[i][r] && this.flexTableData[i][r] != 0) || this.flexTableData[i][r].length <= 0)
+              ){
+                _hasNoVaild = true
+                break
+                // if(!_hasNoVaild[r]){_hasNoVaild[r] = []}
+                // _hasNoVaild[r].push(this.detailFormRules[r][v])
+              }
+              // 其他规则处理
+              if(this.detailFormRules[r][v].valid){
+                let _valid = this.detailFormRules[r][v].valid(this.flexTableData[i][r])
+                if(!_valid){
+                  _hasNoVaild = true
+                  break
+                }
+              }
+            }
+          }
+        }
+      }
+      // 如果有检测规则未通过的，全部规则提示处理
+      if(_hasNoVaild){
+        let vaild_zh = {}
+        // rule的prop转义
+        this.flexTableColumns.forEach(item=>{
+          vaild_zh[item.prop] = item.label
+        })
+        // 全部提示整合
+        let _tipper = "所有列检验规则:<br/>"
+        for(var i in this.detailFormRules){
+          this.detailFormRules[i].forEach(item=>{
+            _tipper += `【${vaild_zh[i]}】列${item.message};<br/>`;
+          })
+        }
+        _tipper += '请按照要求填写'
+        if(!this.showDetailRulesTipper){
+          this.showDetailRulesTipper = _tipper
+          this.$message({
+            dangerouslyUseHTMLString: true,
+            message: _tipper,
+            type: 'error',
+            showClose:true,
+            onClose:(()=>{
+              this.showDetailRulesTipper = null
+            })
+          }) 
+        }
+        return
+      }
+      this.flexTableData_stag = JSON.parse(JSON.stringify(this.flexTableData))
+      this.detailPopShow = false
+      this.$emit("sureDetailPop")
+    },
     // 提交表单
     submitHandle(){
       this.$refs.addEditFrom_Ref.validate((valid) => {
         if(this.submitForm){
-          this.submitForm(valid,this.formData,this.handleType,this.formItemData,this.formRules)
+          this.submitForm(valid,this.formData,this.flexTableData,this.handleType,this.formItemData,this.formRules,this.detailFormRules)
           return
         }
-        this.formData.details = this.flexTableData
-        this.Loading.addEditApiLoading = true
         if (valid) {
-          // 新增
-          if(this.handleType == 'add'){
-            ApiTypePost(
-              this.formData, 
-              this.currentDtos.C.actionsUrl
-            ).then(res => {
-              this.changeActive(1)
-            }).catch(err => {
-              this.changeActive(2)
-            })
-          }
-          // 编辑
-          else{
-            ApiTypePut(
-              this.formData, 
-              this.formData.id, 
-              this.currentDtos.U.actionsUrl
-            ).then(res => {
-              this.changeActive(1)
-            }).catch(err => {
-              this.changeActive(2)
-            })
+          if(this.isHaveDetail() && (!this.flexTableData || this.flexTableData.length <=0 )){
+            this.$confirm('您还未编辑子表信息, 是否确定提交?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.formData.details = this.flexTableData
+              this.Loading.addEditApiLoading = true
+              // 新增
+              if(this.handleType == 'add'){
+                ApiTypePost(
+                  this.formData, 
+                  this.currentDtos.C.actionsUrl
+                ).then(res => {
+                  this.changeActive(1)
+                }).catch(err => {
+                  this.changeActive(2)
+                })
+              }
+              // 编辑
+              else{
+                ApiTypePut(
+                  this.formData, 
+                  this.formData.id, 
+                  this.currentDtos.U.actionsUrl
+                ).then(res => {
+                  this.changeActive(1)
+                }).catch(err => {
+                  this.changeActive(2)
+                })
+              }
+            }).catch(() => {
+      
+            });
           }
         } else {
           return false;
@@ -364,4 +509,20 @@ export default {
       }
     }
   }
+
+  .detailPop{
+
+    ::v-deep .el-dialog{
+      margin-bottom:0
+    }
+  }
+
+  .imitateDetailPopModal{
+    background: rgba(0, 0, 0, 0.5);
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
 </style>
\ No newline at end of file
diff --git a/WinIn.FasterZ.Wms.Fe/src/components/commonTabel-drawer/index.vue b/WinIn.FasterZ.Wms.Fe/src/components/commonTabel-drawer/index.vue
index e92d1de36..65a73eec6 100644
--- a/WinIn.FasterZ.Wms.Fe/src/components/commonTabel-drawer/index.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/components/commonTabel-drawer/index.vue
@@ -49,6 +49,7 @@
         @handleClick="handleClick"
       >
         <template slot-scope="scope">
+          <!-- 详情 -->
           <curren-descriptions
             border
             v-if="scope.value == 'xq'"
@@ -59,6 +60,17 @@
             :propsData="propsData"
           >
           </curren-descriptions>
+          <!-- 主表信息 -->
+          <curren-descriptions
+            border
+            v-if="scope.value == 'masterInfo'"
+            :column="column"
+            :direction="direction"
+            :colon="false"
+            :tabsDesTions="masterColums"
+            :propsData="propsData.masterInfo"
+          >
+          </curren-descriptions>
           <!-- 明细 包含分页 头部按钮等 -->
           <tablePagination
             ref="tablePaginationForMX_Ref"
@@ -104,11 +116,12 @@
             </template>		
           </umyTable>
           <!-- 自定义扩展 -->
-          <umyTable
+          <!-- <umyTable
             v-if="
               scope.value == zdyValue && 
               scope.value != 'xq' &&
               scope.value != 'mx' && 
+              scope.value != 'masterInfo' &&
               scope.value != 'hz' &&
               scope.value != 'zwlcj'
             "
@@ -127,7 +140,7 @@
             <template>
               <slot></slot>
             </template>		
-          </umyTable>
+          </umyTable> -->
         </template>
       </curren-tabs>
     </div>
@@ -171,6 +184,10 @@ import pagination from "@/components/Pagination"
 import rowDrop from "@/components/rowDrop/index.vue"
 import * as allUrlOption from '@/utils/baseData/urlOption'
 import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { 
+  initApiColumnsForDto,
+  sliceStrEndDelete
+} from '@/utils/index'
 export default {
   name: 'currenTabel-drawer',
   components: {
@@ -309,7 +326,8 @@ export default {
       // 带有特殊扩展tabs页的
       if (this.dropdownTabsData.length !== 0) {
         return this.dropdownTabsData
-      } else {
+      } 
+      else {
         // 正常普通 详情，明细，汇总
         // if (Object.keys(this.propsData).length != 0) {
         if (Object.keys(this.propsData)) {
@@ -317,6 +335,14 @@ export default {
             label: "详情",
             name: 'xq'
           }]
+          if(this.propsData.masterInfo && this.propsData.masterInfo){
+            this.initDropdownTabsData.push({
+              label: "主表信息",
+              name: 'masterInfo'
+            })
+            let _master_name = this.URLOption.masterRoute || sliceStrEndDelete(this.$route.name,'Detail')
+            this.masterColums = initApiColumnsForDto(this.propsData.masterInfo,_master_name,this)
+          }
           // 明细可以为空数组，前端分页使用
           if(this.propsData.details){
             this.initDropdownTabsData.push({
@@ -343,9 +369,9 @@ export default {
       detailHeaderButton:null,//明细-上方按钮
       detailInfoTableData:null,//明细-查看详情弹窗数据
       detailInfoTitle:null,//明细-查看详情弹窗title
-      otherData:[], // 切换tabs页赋值
-      zdyTableColumns:[], // 自定义表头
-      zdyValue:'', // 自定义展现值
+      // otherData:[], // 切换tabs页赋值
+      // zdyTableColumns:[], // 自定义表头
+      // zdyValue:'', // 自定义展现值
       // firstTabs:'xq',
       initDropdownTabsData:[
         {
@@ -375,10 +401,14 @@ export default {
         MaxResultCount: 20,
       },
       totalCountForDetail:0,
+       //明细-查看主表的连接id
+      URLOption:allUrlOption[this.$route.name],
       //明细-查看主表的连接id
       URLOption_masterId:allUrlOption[this.$route.name].masterId || 'masterId',
       //明细-列表
       URLOption_detailList:allUrlOption[this.$route.name].detailListURL,
+      // 有主表的子表列，主表信息的表头
+      masterColums:null
     }
   },
   methods: {
@@ -574,7 +604,7 @@ export default {
     // tabs 切换页
     handleClick (val) {
       this.$emit("currenTabsChange", val);//父级获取当前的tab内容
-      this.zdyValue = val.name
+      // this.zdyValue = val.name
       this.dropdownTabsData.forEach( item => {
         if (item.name == val.name) {
           let parent = this.$parent
@@ -582,12 +612,12 @@ export default {
           // 详情 明细 汇总
           parent.firstTabs = val.name
           if (val.name == 'xq' || val.name == 'mx' || val.name == 'hz') {
-            this.zdyTableColumns = []
-            this.otherData = []
+            // this.zdyTableColumns = []
+            // this.otherData = []
             parent.tableLoading = false
           } else {
-            this.zdyTableColumns = []
-            this.otherData = []
+            // this.zdyTableColumns = []
+            // this.otherData = []
             // this.firstTabs = val.name
             // 其他自定义tab页
             // if (item.functionName == 'getListByItemcode') {
diff --git a/WinIn.FasterZ.Wms.Fe/src/components/currenButton/index.vue b/WinIn.FasterZ.Wms.Fe/src/components/currenButton/index.vue
index 3f65acb65..40e53c9f1 100644
--- a/WinIn.FasterZ.Wms.Fe/src/components/currenButton/index.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/components/currenButton/index.vue
@@ -67,7 +67,6 @@ export default {
       this.Butttondata.forEach(item=>{
         if(item.float && item.float == 'right'){
           this.buttonsRight.push(item)
-          console.log(70,this.buttonsRight)
         }else{
           this.buttonsLeft.push(item)
         }
diff --git a/WinIn.FasterZ.Wms.Fe/src/components/currenTableFlex/index.vue b/WinIn.FasterZ.Wms.Fe/src/components/currenTableFlex/index.vue
index 1cd5760d0..618933d73 100644
--- a/WinIn.FasterZ.Wms.Fe/src/components/currenTableFlex/index.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/components/currenTableFlex/index.vue
@@ -278,7 +278,12 @@
     methods: {
       //添加行
       flexOpenAddNew() {
-        let _oneRow =  Object.assign({}, this.flexTableData[0])
+        // 则从表头中取值，设置默认参数为null
+        let _oneRow =  {}
+        this.flexTableColumns.forEach(item=>{
+          _oneRow[item.prop] = null
+        })
+        // _oneRow =  Object.assign({}, this.flexTableData[0])
         for(let key in _oneRow){
           _oneRow[key]  = null
         }
diff --git a/WinIn.FasterZ.Wms.Fe/src/components/filterForDetailPage/index.vue b/WinIn.FasterZ.Wms.Fe/src/components/filterForDetailPage/index.vue
index fc38f427d..8008d7c0d 100644
--- a/WinIn.FasterZ.Wms.Fe/src/components/filterForDetailPage/index.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/components/filterForDetailPage/index.vue
@@ -129,6 +129,7 @@ import { LoadingMixins } from "@/mixins/LoadingMixins";
 import { mixins } from "@/mixins/mixins";
 import { filterSelectMixins } from '@/mixins/filter-Select'
 import {getListDesById,getPageListForDetail} from "@/api/wms-api"
+import { initApiColumnsForDto } from '@/utils/index'
 export default {
     name: 'filterForDetailPage',
     mixins: [
@@ -263,7 +264,7 @@ export default {
                 .then(res=>{
                     // 表头处理
                     let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
-                    let _Columns = this.initApiColumnsForDto(res.items[0],_parentName)
+                    let _Columns = initApiColumnsForDto(res.items[0],_parentName,this)
                     this.listColumns = this.initTableColumns(_Columns,'detailPage_api')
                     // 页面数据处理
                     if(res){
diff --git a/WinIn.FasterZ.Wms.Fe/src/components/umyTable/index.vue b/WinIn.FasterZ.Wms.Fe/src/components/umyTable/index.vue
index 397654c27..9c51902c8 100644
--- a/WinIn.FasterZ.Wms.Fe/src/components/umyTable/index.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/components/umyTable/index.vue
@@ -130,7 +130,7 @@
     <u-table-column
       v-if="buttonOperationList_left"
       :fixed="'left'"
-      width="auto"
+      :width="operationLeftColumnWidth()"
       min-width="120px"
       :align="'center'"
       :header-align="'center'"
@@ -144,6 +144,7 @@
           :key="indexButton"
           type="text"
           size="mini"
+          :style="{color:itemButton.color || '#409EFF'}"
           @click="buttonOperationClick_left(scope.row, itemButton, indexButton)"
         >{{itemButton.label}}</el-button>
       </template>
@@ -250,7 +251,7 @@ export default {
     // table是否有border
     tableBorder: {
       type: Boolean,
-      default: false,
+      default: true,
     },
     // 是否为第一个浮动，如果是，则item中的fixed无效（应用场景：主列表，因为用户排序不定元素为第一项）
     firstFixed: {
@@ -398,6 +399,11 @@ export default {
     this.setTableHeightHandle()
   },
   methods: {
+    // 左侧操作列宽度适应
+    operationLeftColumnWidth(){
+      if(this.buttonOperationList_left.length == 1){return 120}
+      else{return this.buttonOperationList_left.length * 100}
+    },
     // 重新渲染表格
     doFreshLayout(){
       if (this.$refs.multipleTable && this.$refs.multipleTable.doLayout) {
diff --git a/WinIn.FasterZ.Wms.Fe/src/mixins/TableMixins.js b/WinIn.FasterZ.Wms.Fe/src/mixins/TableMixins.js
index b6e4ac4fc..feb5d67ec 100644
--- a/WinIn.FasterZ.Wms.Fe/src/mixins/TableMixins.js
+++ b/WinIn.FasterZ.Wms.Fe/src/mixins/TableMixins.js
@@ -1,11 +1,13 @@
-import i18n from "@/lang"
 import {
   getPageList,
   getDetailed,
   postDelete,
   ApiTypeDelete
 } from '@/api/wms-api'
-import { zhApiColumnsLable,firstWordSizeChange } from '@/utils/index'
+import { 
+  initApiColumnsForDto,
+  sliceStrEndDelete
+} from '@/utils/index'
 export const tableMixins = {
   data() {
     return {
@@ -103,9 +105,22 @@ export const tableMixins = {
       }
       // 编辑 api
       else if (item.name == "editFromApi") {
-        this.addEditApiType = 'edit'
-        this.editFromApiRowData = row
-        this.displayDialog.addEditApiDialog = true;
+        // this.addEditApiType = 'edit'
+        // this.editFromApiRowData = row
+        // this.displayDialog.addEditApiDialog = true;
+        
+        let _url = this.URLOption_detail ? this.URLOption_detail : this.URLOption_base
+        this.Loading.tableLoading = true
+        getDetailed(row.id, _url)
+          .then(res=>{
+            this.addEditApiType = 'edit'
+            this.editFromApiRowData = res
+            this.displayDialog.addEditApiDialog = true;
+            this.Loading.tableLoading = false
+          })
+          .catch(err=>{
+            this.Loading.tableLoading = false
+          })
       }
       // 删除
       else if (item.name == "delete"){
@@ -158,95 +173,6 @@ export const tableMixins = {
     //   if(detailsTable && detailsTable[this.$route.name])this.apiColumns_DetailsTable = this.initTableColumns(detailsTable[this.$route.name],'detail_api')
       // if(detailsPage && detailsPage[this.$route.name])this.apiColumns_DetailsPage = this.initTableColumns(detailsPage[this.$route.name],'detailPage_api')
     // },
-    // get-dto-column-type接口表头类型初始化
-    initApiColumnsForDto(list,titleName){
-      let data = this.$store.getters.dtoColumnTypes
-      let _coloums = data[titleName].S
-      let _Columns_Table = []
-      if(_coloums){
-        let _data = _coloums.dtoList
-        _data.forEach(item=>{
-          // 如果list接口存在数据 ，与list接口返回字段比较处理,list接口存在的话则追加
-          let _if = firstWordSizeChange(item.name) != 'details'
-          if(list){
-            _if = firstWordSizeChange(item.name) in list && firstWordSizeChange(item.name) != 'details'
-          }
-          if(_if){
-            _Columns_Table.push(item)
-          }
-        })
-      }
-      if(list){
-        _Columns_Table = _Columns_Table.concat(this.specialAddColumns(list,titleName))
-      }
-      return _Columns_Table
-    },
-    // 添加特殊字段（api中没有的字段特殊处理）
-    specialAddColumns(list,titleName){
-      let _apiName = titleName
-      let _special_list=[]
-      // creationTime
-      if('creationTime' in list){
-        _special_list.push(
-          {
-            "name": "CreationTime",
-            "apiBaseType": "datetime",
-            "baseApiName": _apiName + 'CreationTime',
-            "label": zhApiColumnsLable(_apiName + 'CreationTime') || i18n.t('columNames.CreationTime'),
-            "prop": "creationTime",
-          }
-        )
-      }
-      // creatorId
-      if('creatorId' in list){
-        _special_list.push(
-          {
-            "name": "CreatorId",
-            "apiBaseType": "string",
-            "baseApiName": _apiName + 'CreatorId',
-            "label": zhApiColumnsLable(_apiName + 'CreatorId') || i18n.t('columNames.CreatorId'),
-            "prop": "creatorId",
-          }
-        )
-      }
-      // lastModificationTime
-      if('lastModificationTime' in list){
-        _special_list.push(
-          {
-            "name": "LastModificationTime",
-            "apiBaseType": "datetime",
-            "baseApiName": _apiName + 'LastModificationTime',
-            "label": zhApiColumnsLable(_apiName + 'LastModificationTime') || i18n.t('columNames.LastModificationTime'),
-            "prop": "lastModificationTime",
-          }
-        )
-      }
-      // lastModifierId
-      if('lastModifierId' in list){
-        _special_list.push(
-          {
-            "name": "LastModifierId",
-            "apiBaseType": "string",
-            "baseApiName": _apiName + 'LastModifierId',
-            "label": zhApiColumnsLable(_apiName + 'LastModifierId') || i18n.t('columNames.LastModifierId'),
-            "prop": "lastModifierId",
-          }
-        )
-      }
-      // tenantId
-      if('tenantId' in list){
-        _special_list.push(
-          {
-            "name": "TenantId",
-            "apiBaseType": "string",
-            "baseApiName": _apiName + 'TenantId',
-            "label": zhApiColumnsLable(_apiName + 'TenantId') || i18n.t('columNames.TenantId'),
-            "prop": "tenantId",
-          }
-        )
-      }
-      return _special_list
-    },
     //渲染数据
     paging(callback,repeat) {
       this.Loading.tableLoading = true;
@@ -255,7 +181,7 @@ export const tableMixins = {
         .then(res=>{
           // 表头处理
           let _list = res.items && res.items.length > 0 ? res.items[0] : null
-          let _Columns = this.initApiColumnsForDto(_list,this.$route.name)
+          let _Columns = initApiColumnsForDto(_list,this.$route.name,this)
           this.apiColumns_Table = this.initTableColumns(_Columns)
           this.apiColumns_DesTions = _Columns
             // 页面数据处理
@@ -312,30 +238,54 @@ export const tableMixins = {
       this.Loading.DrawerLoading = true
       this.displayDialog.detailsDialog = true;
       let _url = this.URLOption_detail ? this.URLOption_detail : this.URLOption_base
-      getDetailed(val.id, _url)
-        .then(res=>{
-          // 打印使用的全部数据存储
-          this.tableDataDetails = JSON.parse(JSON.stringify(res))
-          // 数据处理
-          this.propsData = res
-          if (res.details) {
-            // 表头处理
-            let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
-            this.apiColumns_DetailsTable = this.initTableColumns(this.initApiColumnsForDto(res.details[0],_parentName),'detail_api')
-            if(this.$refs.currenDrawer_Ref){
-              this.$refs.currenDrawer_Ref.getDetailList(res,()=>{
-                this.inlineDialogCallback()
-              },()=>{
-                this.Loading.DrawerLoading = false
-              })
-            }
-          }else{
-            this.Loading.DrawerLoading = false
-          }
-        })
-        .catch(err=>{
+      // 有主表信息子表(表头处理)
+      if(!this.URLOption.isMaster && this.URLOption.hasDetail){
+        let _showMasterUrl = this.URLOption.mainShowMasterUrl
+        if(!this.URLOption.mainShowMasterUrl){
+          _showMasterUrl = sliceStrEndDelete(this.URLOption_detail,'-Detail')
+        }
+        Promise.all([
+          getDetailed(val.id, _url),
+          getDetailed(val[this.URLOption.mainShowMasterId || 'masterId'], _showMasterUrl)
+        ]).then((res) => {
+          let _allRes = JSON.parse(JSON.stringify(res[0]))
+          _allRes.masterInfo = res[1]
+          this.initInlineHttpBack(_allRes)
+        }).catch(()=>{
           this.Loading.DrawerLoading = false
         })
+      }
+      // 没有主表信息
+      else{
+        getDetailed(val.id, _url)
+          .then(res=>{
+            this.initInlineHttpBack(res)
+          })
+          .catch(err=>{
+            this.Loading.DrawerLoading = false
+          })
+      }
+    },
+    // 查看详情获取返回值后处理
+    initInlineHttpBack(res){
+      // 打印使用的全部数据存储
+      this.tableDataDetails = JSON.parse(JSON.stringify(res))
+      // 数据处理
+      this.propsData = res
+      if (res.details) {
+        // 表头处理
+        let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
+        this.apiColumns_DetailsTable = this.initTableColumns(initApiColumnsForDto(res.details[0],_parentName,this),'detail_api')
+        if(this.$refs.currenDrawer_Ref){
+          this.$refs.currenDrawer_Ref.getDetailList(res,()=>{
+            this.inlineDialogCallback()
+          },()=>{
+            this.Loading.DrawerLoading = false
+          })
+        }
+      }else{
+        this.Loading.DrawerLoading = false
+      }
     },
     // 前端分页处理
     // detailListPageFromFE(data){
diff --git a/WinIn.FasterZ.Wms.Fe/src/mixins/mixins.js b/WinIn.FasterZ.Wms.Fe/src/mixins/mixins.js
index 7f8b689e0..996fdd16f 100644
--- a/WinIn.FasterZ.Wms.Fe/src/mixins/mixins.js
+++ b/WinIn.FasterZ.Wms.Fe/src/mixins/mixins.js
@@ -8,6 +8,8 @@ import { getLoginName } from "@/utils/auth"
 export const mixins = {
   data() {
     return {
+      // 当前路由配置
+      URLOption:allUrlOption[this.$route.name],
       //主表-列表
       URLOption_base:allUrlOption[this.$route.name].baseURL,
       //主表-明细
diff --git a/WinIn.FasterZ.Wms.Fe/src/styles/index.scss b/WinIn.FasterZ.Wms.Fe/src/styles/index.scss
index af837d30e..a3fba6eef 100644
--- a/WinIn.FasterZ.Wms.Fe/src/styles/index.scss
+++ b/WinIn.FasterZ.Wms.Fe/src/styles/index.scss
@@ -276,4 +276,14 @@ aside {
     height: 22px;
     background: #1890ff;
   }
+
+  .buttonBox{
+    position: absolute;
+    right: 10px;
+    top: 15px;
+
+    button{
+      float: left;
+    }
+  }
 }
\ No newline at end of file
diff --git a/WinIn.FasterZ.Wms.Fe/src/utils/baseData/urlOption.js b/WinIn.FasterZ.Wms.Fe/src/utils/baseData/urlOption.js
index 9e010f484..dab22db7f 100644
--- a/WinIn.FasterZ.Wms.Fe/src/utils/baseData/urlOption.js
+++ b/WinIn.FasterZ.Wms.Fe/src/utils/baseData/urlOption.js
@@ -1,1035 +1,2040 @@
+//开始------------------只有主表 AbpAuditLog------------------ 
 export const AbpAuditLog = { 
   baseURL:'AbpAuditLog/base',//主表-列表 
   detailURL:'app/Abp-Audit-Log',//主表-明细 + 明细-查看主表 
- } 
-  export const AuthDepartment = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 AuthDepartment------------------ 
+export const AuthDepartment = { 
   baseURL:'AuthDepartment/base',//主表-列表 
   detailURL:'app/Auth-Department',//主表-明细 + 明细-查看主表 
- } 
-  export const AuthMenu = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 AuthMenu------------------ 
+export const AuthMenu = { 
   baseURL:'AuthMenu/base',//主表-列表 
   detailURL:'app/Auth-Menu',//主表-明细 + 明细-查看主表 
- } 
-  export const AuthUserMenu = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 AuthUserMenu------------------ 
+export const AuthUserMenu = { 
   baseURL:'AuthUserMenu/base',//主表-列表 
   detailURL:'app/Auth-User-Menu',//主表-明细 + 明细-查看主表 
- } 
-  export const AuthUserWorkGroup = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 AuthUserWorkGroup------------------ 
+export const AuthUserWorkGroup = { 
   baseURL:'AuthUserWorkGroup/base',//主表-列表 
   detailURL:'app/Auth-User-Work-Group',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataAql = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataAql------------------ 
+export const BasedataAql = { 
   baseURL:'BasedataAql/base',//主表-列表 
   detailURL:'app/Basedata-Aql',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataArea = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataArea------------------ 
+export const BasedataArea = { 
   baseURL:'BasedataArea/base',//主表-列表 
   detailURL:'app/Basedata-Area',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataBom = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataBom------------------ 
+export const BasedataBom = { 
   baseURL:'BasedataBom/base',//主表-列表 
   detailURL:'app/Basedata-Bom',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataCalendar = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataCalendar------------------ 
+export const BasedataCalendar = { 
   baseURL:'BasedataCalendar/base',//主表-列表 
   detailURL:'app/Basedata-Calendar',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataCategory = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataCategory------------------ 
+export const BasedataCategory = { 
   baseURL:'BasedataCategory/base',//主表-列表 
   detailURL:'app/Basedata-Category',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataCurrency = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataCurrency------------------ 
+export const BasedataCurrency = { 
   baseURL:'BasedataCurrency/base',//主表-列表 
   detailURL:'app/Basedata-Currency',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataCurrencyExchange = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataCurrencyExchange------------------ 
+export const BasedataCurrencyExchange = { 
   baseURL:'BasedataCurrencyExchange/base',//主表-列表 
   detailURL:'app/Basedata-Currency-Exchange',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataCustomer = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataCustomer------------------ 
+export const BasedataCustomer = { 
   baseURL:'BasedataCustomer/base',//主表-列表 
   detailURL:'app/Basedata-Customer',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataCustomerAddress = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataCustomerAddress------------------ 
+export const BasedataCustomerAddress = { 
   baseURL:'BasedataCustomerAddress/base',//主表-列表 
   detailURL:'app/Basedata-Customer-Address',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataCustomerItem = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataCustomerItem------------------ 
+export const BasedataCustomerItem = { 
   baseURL:'BasedataCustomerItem/base',//主表-列表 
   detailURL:'app/Basedata-Customer-Item',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataDict = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataDict------------------ 
+export const BasedataDict = { 
   baseURL:'BasedataDict/base',//主表-列表 
   detailURL:'app/Basedata-Dict',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataDictItem = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataDictItem------------------ 
+export const BasedataDictItem = { 
   baseURL:'BasedataDictItem/base',//主表-列表 
   detailURL:'app/Basedata-Dict-Item',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataDock = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataDock------------------ 
+export const BasedataDock = { 
   baseURL:'BasedataDock/base',//主表-列表 
   detailURL:'app/Basedata-Dock',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataDocumentSetting = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataDocumentSetting------------------ 
+export const BasedataDocumentSetting = { 
   baseURL:'BasedataDocumentSetting/base',//主表-列表 
   detailURL:'app/Basedata-Document-Setting',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataErpLocation = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataErpLocation------------------ 
+export const BasedataErpLocation = { 
   baseURL:'BasedataErpLocation/base',//主表-列表 
   detailURL:'app/Basedata-Erp-Location',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataInterfaceCalendar = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataInterfaceCalendar------------------ 
+export const BasedataInterfaceCalendar = { 
   baseURL:'BasedataInterfaceCalendar/base',//主表-列表 
   detailURL:'app/Basedata-Interface-Calendar',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataItemBasic = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataItemBasic------------------ 
+export const BasedataItemBasic = { 
   baseURL:'BasedataItemBasic/base',//主表-列表 
   detailURL:'app/Basedata-Item-Basic',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataItemCategory = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataItemCategory------------------ 
+export const BasedataItemCategory = { 
   baseURL:'BasedataItemCategory/base',//主表-列表 
   detailURL:'app/Basedata-Item-Category',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataItemGuideBook = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataItemGuideBook------------------ 
+export const BasedataItemGuideBook = { 
   baseURL:'BasedataItemGuideBook/base',//主表-列表 
   detailURL:'app/Basedata-Item-Guide-Book',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataItemPack = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataItemPack------------------ 
+export const BasedataItemPack = { 
   baseURL:'BasedataItemPack/base',//主表-列表 
   detailURL:'app/Basedata-Item-Pack',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataItemQuality = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataItemQuality------------------ 
+export const BasedataItemQuality = { 
   baseURL:'BasedataItemQuality/base',//主表-列表 
   detailURL:'app/Basedata-Item-Quality',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataItemSafetyStock = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataItemSafetyStock------------------ 
+export const BasedataItemSafetyStock = { 
   baseURL:'BasedataItemSafetyStock/base',//主表-列表 
   detailURL:'app/Basedata-Item-Safety-Stock',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataItemStoreRelation = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataItemStoreRelation------------------ 
+export const BasedataItemStoreRelation = { 
   baseURL:'BasedataItemStoreRelation/base',//主表-列表 
   detailURL:'app/Basedata-Item-Store-Relation',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataLocation = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataLocation------------------ 
+export const BasedataLocation = { 
   baseURL:'BasedataLocation/base',//主表-列表 
   detailURL:'app/Basedata-Location',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataLocationGroup = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataLocationGroup------------------ 
+export const BasedataLocationGroup = { 
   baseURL:'BasedataLocationGroup/base',//主表-列表 
   detailURL:'app/Basedata-Location-Group',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataMachine = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataMachine------------------ 
+export const BasedataMachine = { 
   baseURL:'BasedataMachine/base',//主表-列表 
   detailURL:'app/Basedata-Machine',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataProductionLine = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataProductionLine------------------ 
+export const BasedataProductionLine = { 
   baseURL:'BasedataProductionLine/base',//主表-列表 
   detailURL:'app/Basedata-Production-Line',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataProductionLineItem = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataProductionLineItem------------------ 
+export const BasedataProductionLineItem = { 
   baseURL:'BasedataProductionLineItem/base',//主表-列表 
   detailURL:'app/Basedata-Production-Line-Item',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataProject = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataProject------------------ 
+export const BasedataProject = { 
   baseURL:'BasedataProject/base',//主表-列表 
   detailURL:'app/Basedata-Project',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataPurchasePriceSheet = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataPurchasePriceSheet------------------ 
+export const BasedataPurchasePriceSheet = { 
   baseURL:'BasedataPurchasePriceSheet/base',//主表-列表 
   detailURL:'app/Basedata-Purchase-Price-Sheet',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataSalePriceSheet = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataSalePriceSheet------------------ 
+export const BasedataSalePriceSheet = { 
   baseURL:'BasedataSalePriceSheet/base',//主表-列表 
   detailURL:'app/Basedata-Sale-Price-Sheet',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataShift = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataShift------------------ 
+export const BasedataShift = { 
   baseURL:'BasedataShift/base',//主表-列表 
   detailURL:'app/Basedata-Shift',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataStdCostPriceSheet = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataStdCostPriceSheet------------------ 
+export const BasedataStdCostPriceSheet = { 
   baseURL:'BasedataStdCostPriceSheet/base',//主表-列表 
   detailURL:'app/Basedata-Std-Cost-Price-Sheet',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataSupplier = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataSupplier------------------ 
+export const BasedataSupplier = { 
   baseURL:'BasedataSupplier/base',//主表-列表 
   detailURL:'app/Basedata-Supplier',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataSupplierItem = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataSupplierItem------------------ 
+export const BasedataSupplierItem = { 
   baseURL:'BasedataSupplierItem/base',//主表-列表 
   detailURL:'app/Basedata-Supplier-Item',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataSupplierTimeWindow = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataSupplierTimeWindow------------------ 
+export const BasedataSupplierTimeWindow = { 
   baseURL:'BasedataSupplierTimeWindow/base',//主表-列表 
   detailURL:'app/Basedata-Supplier-Time-Window',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataTeam = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataTeam------------------ 
+export const BasedataTeam = { 
   baseURL:'BasedataTeam/base',//主表-列表 
   detailURL:'app/Basedata-Team',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataTransactionType = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataTransactionType------------------ 
+export const BasedataTransactionType = { 
   baseURL:'BasedataTransactionType/base',//主表-列表 
   detailURL:'app/Basedata-Transaction-Type',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataUom = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataUom------------------ 
+export const BasedataUom = { 
   baseURL:'BasedataUom/base',//主表-列表 
   detailURL:'app/Basedata-Uom',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataWarehouse = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataWarehouse------------------ 
+export const BasedataWarehouse = { 
   baseURL:'BasedataWarehouse/base',//主表-列表 
   detailURL:'app/Basedata-Warehouse',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataWorkGroup = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataWorkGroup------------------ 
+export const BasedataWorkGroup = { 
   baseURL:'BasedataWorkGroup/base',//主表-列表 
   detailURL:'app/Basedata-Work-Group',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataWorkShop = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataWorkShop------------------ 
+export const BasedataWorkShop = { 
   baseURL:'BasedataWorkShop/base',//主表-列表 
   detailURL:'app/Basedata-Work-Shop',//主表-明细 + 明细-查看主表 
- } 
-  export const BasedataWorkStation = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 BasedataWorkStation------------------ 
+export const BasedataWorkStation = { 
   baseURL:'BasedataWorkStation/base',//主表-列表 
   detailURL:'app/Basedata-Work-Station',//主表-明细 + 明细-查看主表 
- } 
-  export const FileStorageDataExportTask = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 FileStorageDataExportTask------------------ 
+export const FileStorageDataExportTask = { 
   baseURL:'FileStorageDataExportTask/base',//主表-列表 
   detailURL:'app/File-Storage-Data-Export-Task',//主表-明细 + 明细-查看主表 
- } 
-  export const FileStorageDataImportTask = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 FileStorageDataImportTask------------------ 
+export const FileStorageDataImportTask = { 
   baseURL:'FileStorageDataImportTask/base',//主表-列表 
   detailURL:'app/File-Storage-Data-Import-Task',//主表-明细 + 明细-查看主表 
- } 
-  export const FileStorageFile = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 FileStorageFile------------------ 
+export const FileStorageFile = { 
   baseURL:'FileStorageFile/base',//主表-列表 
   detailURL:'app/File-Storage-File',//主表-明细 + 明细-查看主表 
- } 
-  export const InventoryBalance = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 InventoryBalance------------------ 
+export const InventoryBalance = { 
   baseURL:'InventoryBalance/base',//主表-列表 
   detailURL:'app/Inventory-Balance',//主表-明细 + 明细-查看主表 
- } 
-  export const InventoryContainer = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 InventoryContainer------------------ 
+export const InventoryContainer = { 
   baseURL:'InventoryContainer/base',//主表-列表 
   detailURL:'app/Inventory-Container',//主表-明细 + 明细-查看主表 
-  detailListURL:'InventoryContainerDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const InventoryContainerDetail = { 
+  detailListURL:'InventoryContainerDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 InventoryContainerDetail------------------ 
+export const InventoryContainerDetail = { 
   baseURL:'InventoryContainerDetail/base',//主表-列表 
   detailURL:'app/Inventory-Container-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const InventoryErpBalance = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 InventoryErpBalance------------------ 
+export const InventoryErpBalance = { 
   baseURL:'InventoryErpBalance/base',//主表-列表 
   detailURL:'app/Inventory-Erp-Balance',//主表-明细 + 明细-查看主表 
- } 
-  export const InventoryExpectIn = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 InventoryExpectIn------------------ 
+export const InventoryExpectIn = { 
   baseURL:'InventoryExpectIn/base',//主表-列表 
   detailURL:'app/Inventory-Expect-In',//主表-明细 + 明细-查看主表 
- } 
-  export const InventoryExpectOut = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 InventoryExpectOut------------------ 
+export const InventoryExpectOut = { 
   baseURL:'InventoryExpectOut/base',//主表-列表 
   detailURL:'app/Inventory-Expect-Out',//主表-明细 + 明细-查看主表 
- } 
-  export const InventoryLocationCapacity = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 InventoryLocationCapacity------------------ 
+export const InventoryLocationCapacity = { 
   baseURL:'InventoryLocationCapacity/base',//主表-列表 
   detailURL:'app/Inventory-Location-Capacity',//主表-明细 + 明细-查看主表 
- } 
-  export const InventorySnapshot = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 InventorySnapshot------------------ 
+export const InventorySnapshot = { 
   baseURL:'InventorySnapshot/base',//主表-列表 
   detailURL:'app/Inventory-Snapshot',//主表-明细 + 明细-查看主表 
- } 
-  export const InventoryTransaction = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 InventoryTransaction------------------ 
+export const InventoryTransaction = { 
   baseURL:'InventoryTransaction/base',//主表-列表 
   detailURL:'app/Inventory-Transaction',//主表-明细 + 明细-查看主表 
- } 
-  export const InventoryTransferLog = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 InventoryTransferLog------------------ 
+export const InventoryTransferLog = { 
   baseURL:'InventoryTransferLog/base',//主表-列表 
   detailURL:'app/Inventory-Transfer-Log',//主表-明细 + 明细-查看主表 
- } 
-  export const JobCheckJob = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 JobCheckJob------------------ 
+export const JobCheckJob = { 
   baseURL:'JobCheckJob/base',//主表-列表 
   detailURL:'app/Job-Check-Job',//主表-明细 + 明细-查看主表 
-  detailListURL:'JobCheckJobDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobCheckJobDetail = { 
+  detailListURL:'JobCheckJobDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobCheckJobDetail------------------ 
+export const JobCheckJobDetail = { 
   baseURL:'JobCheckJobDetail/base',//主表-列表 
   detailURL:'app/Job-Check-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobCountJob = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 JobCountJob------------------ 
+export const JobCountJob = { 
   baseURL:'JobCountJob/base',//主表-列表 
   detailURL:'app/Job-Count-Job',//主表-明细 + 明细-查看主表 
-  detailListURL:'JobCountJobDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobCountJobDetail = { 
+  detailListURL:'JobCountJobDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobCountJobDetail------------------ 
+export const JobCountJobDetail = { 
   baseURL:'JobCountJobDetail/base',//主表-列表 
   detailURL:'app/Job-Count-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobDeliverJob = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 JobDeliverJob------------------ 
+export const JobDeliverJob = { 
   baseURL:'JobDeliverJob/base',//主表-列表 
   detailURL:'app/Job-Deliver-Job',//主表-明细 + 明细-查看主表 
-  detailListURL:'JobDeliverJobDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobDeliverJobDetail = { 
+  detailListURL:'JobDeliverJobDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobDeliverJobDetail------------------ 
+export const JobDeliverJobDetail = { 
   baseURL:'JobDeliverJobDetail/base',//主表-列表 
   detailURL:'app/Job-Deliver-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobInspectJob = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 JobInspectJob------------------ 
+export const JobInspectJob = { 
   baseURL:'JobInspectJob/base',//主表-列表 
   detailURL:'app/Job-Inspect-Job',//主表-明细 + 明细-查看主表 
-  detailListURL:'JobInspectJobDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobInspectJobDetail = { 
+  detailListURL:'JobInspectJobDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobInspectJobDetail------------------ 
+export const JobInspectJobDetail = { 
   baseURL:'JobInspectJobDetail/base',//主表-列表 
   detailURL:'app/Job-Inspect-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobInspectJobSummaryDetail = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobInspectJobSummaryDetail------------------ 
+export const JobInspectJobSummaryDetail = { 
   baseURL:'JobInspectJobSummaryDetail/base',//主表-列表 
   detailURL:'app/Job-Inspect-Job-Summary-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobIssueJob = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 JobIssueJob------------------ 
+export const JobIssueJob = { 
   baseURL:'JobIssueJob/base',//主表-列表 
   detailURL:'app/Job-Issue-Job',//主表-明细 + 明细-查看主表 
-  detailListURL:'JobIssueJobDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobIssueJobDetail = { 
+  detailListURL:'JobIssueJobDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobIssueJobDetail------------------ 
+export const JobIssueJobDetail = { 
   baseURL:'JobIssueJobDetail/base',//主表-列表 
   detailURL:'app/Job-Issue-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobJisDeliverJob = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 JobJisDeliverJob------------------ 
+export const JobJisDeliverJob = { 
   baseURL:'JobJisDeliverJob/base',//主表-列表 
   detailURL:'app/Job-Jis-Deliver-Job',//主表-明细 + 明细-查看主表 
-  detailListURL:'JobJisDeliverJobDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobJisDeliverJobDetail = { 
+  detailListURL:'JobJisDeliverJobDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobJisDeliverJobDetail------------------ 
+export const JobJisDeliverJobDetail = { 
   baseURL:'JobJisDeliverJobDetail/base',//主表-列表 
   detailURL:'app/Job-Jis-Deliver-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobProductionReturnJob = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 JobProductionReturnJob------------------ 
+export const JobProductionReturnJob = { 
   baseURL:'JobProductionReturnJob/base',//主表-列表 
   detailURL:'app/Job-Production-Return-Job',//主表-明细 + 明细-查看主表 
-  detailListURL:'JobProductionReturnJobDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobProductionReturnJobDetail = { 
+  detailListURL:'JobProductionReturnJobDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobProductionReturnJobDetail------------------ 
+export const JobProductionReturnJobDetail = { 
   baseURL:'JobProductionReturnJobDetail/base',//主表-列表 
   detailURL:'app/Job-Production-Return-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobProductReceiveJob = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 JobProductReceiveJob------------------ 
+export const JobProductReceiveJob = { 
   baseURL:'JobProductReceiveJob/base',//主表-列表 
   detailURL:'app/Job-Product-Receive-Job',//主表-明细 + 明细-查看主表 
-  detailListURL:'JobProductReceiveJobDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobProductReceiveJobDetail = { 
+  detailListURL:'JobProductReceiveJobDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobProductReceiveJobDetail------------------ 
+export const JobProductReceiveJobDetail = { 
   baseURL:'JobProductReceiveJobDetail/base',//主表-列表 
   detailURL:'app/Job-Product-Receive-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobPurchaseReceiptJob = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 JobPurchaseReceiptJob------------------ 
+export const JobPurchaseReceiptJob = { 
   baseURL:'JobPurchaseReceiptJob/base',//主表-列表 
   detailURL:'app/Job-Purchase-Receipt-Job',//主表-明细 + 明细-查看主表 
-  detailListURL:'JobPurchaseReceiptJobDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobPurchaseReceiptJobDetail = { 
+  detailListURL:'JobPurchaseReceiptJobDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobPurchaseReceiptJobDetail------------------ 
+export const JobPurchaseReceiptJobDetail = { 
   baseURL:'JobPurchaseReceiptJobDetail/base',//主表-列表 
   detailURL:'app/Job-Purchase-Receipt-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobPurchaseReturnJob = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 JobPurchaseReturnJob------------------ 
+export const JobPurchaseReturnJob = { 
   baseURL:'JobPurchaseReturnJob/base',//主表-列表 
   detailURL:'app/Job-Purchase-Return-Job',//主表-明细 + 明细-查看主表 
-  detailListURL:'JobPurchaseReturnJobDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobPurchaseReturnJobDetail = { 
+  detailListURL:'JobPurchaseReturnJobDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobPurchaseReturnJobDetail------------------ 
+export const JobPurchaseReturnJobDetail = { 
   baseURL:'JobPurchaseReturnJobDetail/base',//主表-列表 
   detailURL:'app/Job-Purchase-Return-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobPutawayJob = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 JobPutawayJob------------------ 
+export const JobPutawayJob = { 
   baseURL:'JobPutawayJob/base',//主表-列表 
   detailURL:'app/Job-Putaway-Job',//主表-明细 + 明细-查看主表 
-  detailListURL:'JobPutawayJobDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobPutawayJobDetail = { 
+  detailListURL:'JobPutawayJobDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobPutawayJobDetail------------------ 
+export const JobPutawayJobDetail = { 
   baseURL:'JobPutawayJobDetail/base',//主表-列表 
   detailURL:'app/Job-Putaway-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobUnplannedIssueJob = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 JobUnplannedIssueJob------------------ 
+export const JobUnplannedIssueJob = { 
   baseURL:'JobUnplannedIssueJob/base',//主表-列表 
   detailURL:'app/Job-Unplanned-Issue-Job',//主表-明细 + 明细-查看主表 
-  detailListURL:'JobUnplannedIssueJobDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobUnplannedIssueJobDetail = { 
+  detailListURL:'JobUnplannedIssueJobDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobUnplannedIssueJobDetail------------------ 
+export const JobUnplannedIssueJobDetail = { 
   baseURL:'JobUnplannedIssueJobDetail/base',//主表-列表 
   detailURL:'app/Job-Unplanned-Issue-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobUnplannedReceiptJob = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 JobUnplannedReceiptJob------------------ 
+export const JobUnplannedReceiptJob = { 
   baseURL:'JobUnplannedReceiptJob/base',//主表-列表 
   detailURL:'app/Job-Unplanned-Receipt-Job',//主表-明细 + 明细-查看主表 
-  detailListURL:'JobUnplannedReceiptJobDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobUnplannedReceiptJobDetail = { 
+  detailListURL:'JobUnplannedReceiptJobDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 JobUnplannedReceiptJobDetail------------------ 
+export const JobUnplannedReceiptJobDetail = { 
   baseURL:'JobUnplannedReceiptJobDetail/base',//主表-列表 
   detailURL:'app/Job-Unplanned-Receipt-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const LabelCountLabel = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 LabelCountLabel------------------ 
+export const LabelCountLabel = { 
   baseURL:'LabelCountLabel/base',//主表-列表 
   detailURL:'app/Label-Count-Label',//主表-明细 + 明细-查看主表 
- } 
-  export const LabelInventoryLabel = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 LabelInventoryLabel------------------ 
+export const LabelInventoryLabel = { 
   baseURL:'LabelInventoryLabel/base',//主表-列表 
   detailURL:'app/Label-Inventory-Label',//主表-明细 + 明细-查看主表 
- } 
-  export const LabelLabelDefinition = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 LabelLabelDefinition------------------ 
+export const LabelLabelDefinition = { 
   baseURL:'LabelLabelDefinition/base',//主表-列表 
   detailURL:'app/Label-Label-Definition',//主表-明细 + 明细-查看主表 
- } 
-  export const LabelPalletCode = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 LabelPalletCode------------------ 
+export const LabelPalletCode = { 
   baseURL:'LabelPalletCode/base',//主表-列表 
   detailURL:'app/Label-Pallet-Code',//主表-明细 + 明细-查看主表 
- } 
-  export const LabelPalletLabel = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 LabelPalletLabel------------------ 
+export const LabelPalletLabel = { 
   baseURL:'LabelPalletLabel/base',//主表-列表 
   detailURL:'app/Label-Pallet-Label',//主表-明细 + 明细-查看主表 
- } 
-  export const LabelSaleLabel = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 LabelSaleLabel------------------ 
+export const LabelSaleLabel = { 
   baseURL:'LabelSaleLabel/base',//主表-列表 
   detailURL:'app/Label-Sale-Label',//主表-明细 + 明细-查看主表 
- } 
-  export const LabelSerialCode = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 LabelSerialCode------------------ 
+export const LabelSerialCode = { 
   baseURL:'LabelSerialCode/base',//主表-列表 
   detailURL:'app/Label-Serial-Code',//主表-明细 + 明细-查看主表 
- } 
-  export const MessageAnnouncement = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 MessageAnnouncement------------------ 
+export const MessageAnnouncement = { 
   baseURL:'MessageAnnouncement/base',//主表-列表 
   detailURL:'app/Message-Announcement',//主表-明细 + 明细-查看主表 
- } 
-  export const MessageMessageType = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 MessageMessageType------------------ 
+export const MessageMessageType = { 
   baseURL:'MessageMessageType/base',//主表-列表 
   detailURL:'app/Message-Message-Type',//主表-明细 + 明细-查看主表 
- } 
-  export const MessageMessageTypeSubscribe = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 MessageMessageTypeSubscribe------------------ 
+export const MessageMessageTypeSubscribe = { 
   baseURL:'MessageMessageTypeSubscribe/base',//主表-列表 
   detailURL:'app/Message-Message-Type-Subscribe',//主表-明细 + 明细-查看主表 
- } 
-  export const MessageNotifyMessage = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 MessageNotifyMessage------------------ 
+export const MessageNotifyMessage = { 
   baseURL:'MessageNotifyMessage/base',//主表-列表 
   detailURL:'app/Message-Notify-Message',//主表-明细 + 明细-查看主表 
- } 
-  export const MessagePrivateMessage = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 MessagePrivateMessage------------------ 
+export const MessagePrivateMessage = { 
   baseURL:'MessagePrivateMessage/base',//主表-列表 
   detailURL:'app/Message-Private-Message',//主表-明细 + 明细-查看主表 
- } 
-  export const MessageUserNotifyMessage = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 MessageUserNotifyMessage------------------ 
+export const MessageUserNotifyMessage = { 
   baseURL:'MessageUserNotifyMessage/base',//主表-列表 
   detailURL:'app/Message-User-Notify-Message',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreBackFlushNote = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreBackFlushNote------------------ 
+export const StoreBackFlushNote = { 
   baseURL:'StoreBackFlushNote/base',//主表-列表 
   detailURL:'app/Store-Back-Flush-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreBackFlushNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreBackFlushNoteDetail = { 
+  detailListURL:'StoreBackFlushNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreBackFlushNoteDetail------------------ 
+export const StoreBackFlushNoteDetail = { 
   baseURL:'StoreBackFlushNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Back-Flush-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreContainerBindNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreContainerBindNote------------------ 
+export const StoreContainerBindNote = { 
   baseURL:'StoreContainerBindNote/base',//主表-列表 
   detailURL:'app/Store-Container-Bind-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreContainerBindNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreContainerBindNoteDetail = { 
+  detailListURL:'StoreContainerBindNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreContainerBindNoteDetail------------------ 
+export const StoreContainerBindNoteDetail = { 
   baseURL:'StoreContainerBindNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Container-Bind-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreCountAdjustNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreCountAdjustNote------------------ 
+export const StoreCountAdjustNote = { 
   baseURL:'StoreCountAdjustNote/base',//主表-列表 
   detailURL:'app/Store-Count-Adjust-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreCountAdjustNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreCountAdjustNoteDetail = { 
+  detailListURL:'StoreCountAdjustNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreCountAdjustNoteDetail------------------ 
+export const StoreCountAdjustNoteDetail = { 
   baseURL:'StoreCountAdjustNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Count-Adjust-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreCountAdjustRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreCountAdjustRequest------------------ 
+export const StoreCountAdjustRequest = { 
   baseURL:'StoreCountAdjustRequest/base',//主表-列表 
   detailURL:'app/Store-Count-Adjust-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreCountAdjustRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreCountAdjustRequestDetail = { 
+  detailListURL:'StoreCountAdjustRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreCountAdjustRequestDetail------------------ 
+export const StoreCountAdjustRequestDetail = { 
   baseURL:'StoreCountAdjustRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Count-Adjust-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreCountNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreCountNote------------------ 
+export const StoreCountNote = { 
   baseURL:'StoreCountNote/base',//主表-列表 
   detailURL:'app/Store-Count-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreCountNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreCountNoteCopy = { 
-  baseURL:'StoreCountNoteCopy/base',//主表-列表 
-  detailURL:'app/Store-Count-Note-Copy',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreCountNoteDetail = { 
+  detailListURL:'StoreCountNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreCountNoteDetail------------------ 
+export const StoreCountNoteDetail = { 
   baseURL:'StoreCountNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Count-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreCountNoteDetailCopy = { 
-  baseURL:'StoreCountNoteDetailCopy/base',//主表-列表 
-  detailURL:'app/Store-Count-Note-Detail-Copy',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreCountPlan = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreCountPlan------------------ 
+export const StoreCountPlan = { 
   baseURL:'StoreCountPlan/base',//主表-列表 
   detailURL:'app/Store-Count-Plan',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreCountPlanDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreCountPlanDetail = { 
+  detailListURL:'StoreCountPlanDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreCountPlanDetail------------------ 
+export const StoreCountPlanDetail = { 
   baseURL:'StoreCountPlanDetail/base',//主表-列表 
   detailURL:'app/Store-Count-Plan-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreCustomerAsn = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreCustomerAsn------------------ 
+export const StoreCustomerAsn = { 
   baseURL:'StoreCustomerAsn/base',//主表-列表 
   detailURL:'app/Store-Customer-Asn',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreCustomerAsnDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreCustomerAsnDetail = { 
+  detailListURL:'StoreCustomerAsnDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreCustomerAsnDetail------------------ 
+export const StoreCustomerAsnDetail = { 
   baseURL:'StoreCustomerAsnDetail/base',//主表-列表 
   detailURL:'app/Store-Customer-Asn-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreCustomerReturnNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreCustomerReturnNote------------------ 
+export const StoreCustomerReturnNote = { 
   baseURL:'StoreCustomerReturnNote/base',//主表-列表 
   detailURL:'app/Store-Customer-Return-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreCustomerReturnNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreCustomerReturnNoteDetail = { 
+  detailListURL:'StoreCustomerReturnNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreCustomerReturnNoteDetail------------------ 
+export const StoreCustomerReturnNoteDetail = { 
   baseURL:'StoreCustomerReturnNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Customer-Return-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreDeliverNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreDeliverNote------------------ 
+export const StoreDeliverNote = { 
   baseURL:'StoreDeliverNote/base',//主表-列表 
   detailURL:'app/Store-Deliver-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreDeliverNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreDeliverNoteDetail = { 
+  detailListURL:'StoreDeliverNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreDeliverNoteDetail------------------ 
+export const StoreDeliverNoteDetail = { 
   baseURL:'StoreDeliverNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Deliver-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreDeliverPlan = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreDeliverPlan------------------ 
+export const StoreDeliverPlan = { 
   baseURL:'StoreDeliverPlan/base',//主表-列表 
   detailURL:'app/Store-Deliver-Plan',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreDeliverPlanDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreDeliverPlanDetail = { 
+  detailListURL:'StoreDeliverPlanDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreDeliverPlanDetail------------------ 
+export const StoreDeliverPlanDetail = { 
   baseURL:'StoreDeliverPlanDetail/base',//主表-列表 
   detailURL:'app/Store-Deliver-Plan-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreDeliverRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreDeliverRequest------------------ 
+export const StoreDeliverRequest = { 
   baseURL:'StoreDeliverRequest/base',//主表-列表 
   detailURL:'app/Store-Deliver-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreDeliverRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreDeliverRequestDetail = { 
+  detailListURL:'StoreDeliverRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreDeliverRequestDetail------------------ 
+export const StoreDeliverRequestDetail = { 
   baseURL:'StoreDeliverRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Deliver-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreExchangeDatum = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------只有主表 StoreExchangeDatum------------------ 
+export const StoreExchangeDatum = { 
   baseURL:'StoreExchangeDatum/base',//主表-列表 
   detailURL:'app/Store-Exchange-Datum',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreInspectAbnormalNote = { 
+  hasDetail:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreInspectAbnormalNote------------------ 
+export const StoreInspectAbnormalNote = { 
   baseURL:'StoreInspectAbnormalNote/base',//主表-列表 
   detailURL:'app/Store-Inspect-Abnormal-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreInspectAbnormalNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreInspectAbnormalNoteDetail = { 
+  detailListURL:'StoreInspectAbnormalNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreInspectAbnormalNoteDetail------------------ 
+export const StoreInspectAbnormalNoteDetail = { 
   baseURL:'StoreInspectAbnormalNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Inspect-Abnormal-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreInspectNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreInspectNote------------------ 
+export const StoreInspectNote = { 
   baseURL:'StoreInspectNote/base',//主表-列表 
   detailURL:'app/Store-Inspect-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreInspectNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreInspectNoteDetail = { 
+  detailListURL:'StoreInspectNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreInspectNoteDetail------------------ 
+export const StoreInspectNoteDetail = { 
   baseURL:'StoreInspectNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Inspect-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreInspectNoteSummaryDetail = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreInspectNoteSummaryDetail------------------ 
+export const StoreInspectNoteSummaryDetail = { 
   baseURL:'StoreInspectNoteSummaryDetail/base',//主表-列表 
   detailURL:'app/Store-Inspect-Note-Summary-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreInspectRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreInspectRequest------------------ 
+export const StoreInspectRequest = { 
   baseURL:'StoreInspectRequest/base',//主表-列表 
   detailURL:'app/Store-Inspect-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreInspectRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreInspectRequestDetail = { 
+  detailListURL:'StoreInspectRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreInspectRequestDetail------------------ 
+export const StoreInspectRequestDetail = { 
   baseURL:'StoreInspectRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Inspect-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreInspectRequestSummaryDetail = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreInspectRequestSummaryDetail------------------ 
+export const StoreInspectRequestSummaryDetail = { 
   baseURL:'StoreInspectRequestSummaryDetail/base',//主表-列表 
   detailURL:'app/Store-Inspect-Request-Summary-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreInventoryInitialNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreInventoryInitialNote------------------ 
+export const StoreInventoryInitialNote = { 
   baseURL:'StoreInventoryInitialNote/base',//主表-列表 
   detailURL:'app/Store-Inventory-Initial-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreInventoryInitialNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreInventoryInitialNoteDetail = { 
+  detailListURL:'StoreInventoryInitialNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreInventoryInitialNoteDetail------------------ 
+export const StoreInventoryInitialNoteDetail = { 
   baseURL:'StoreInventoryInitialNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Inventory-Initial-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreInventoryTransferNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreInventoryTransferNote------------------ 
+export const StoreInventoryTransferNote = { 
   baseURL:'StoreInventoryTransferNote/base',//主表-列表 
   detailURL:'app/Store-Inventory-Transfer-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreInventoryTransferNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreInventoryTransferNoteDetail = { 
+  detailListURL:'StoreInventoryTransferNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreInventoryTransferNoteDetail------------------ 
+export const StoreInventoryTransferNoteDetail = { 
   baseURL:'StoreInventoryTransferNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Inventory-Transfer-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreIsolationNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreIsolationNote------------------ 
+export const StoreIsolationNote = { 
   baseURL:'StoreIsolationNote/base',//主表-列表 
   detailURL:'app/Store-Isolation-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreIsolationNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreIsolationNoteDetail = { 
+  detailListURL:'StoreIsolationNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreIsolationNoteDetail------------------ 
+export const StoreIsolationNoteDetail = { 
   baseURL:'StoreIsolationNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Isolation-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreIssueNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreIssueNote------------------ 
+export const StoreIssueNote = { 
   baseURL:'StoreIssueNote/base',//主表-列表 
   detailURL:'app/Store-Issue-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreIssueNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreIssueNoteDetail = { 
+  detailListURL:'StoreIssueNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreIssueNoteDetail------------------ 
+export const StoreIssueNoteDetail = { 
   baseURL:'StoreIssueNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Issue-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreItemTransformNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreItemTransformNote------------------ 
+export const StoreItemTransformNote = { 
   baseURL:'StoreItemTransformNote/base',//主表-列表 
   detailURL:'app/Store-Item-Transform-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreItemTransformNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreItemTransformNoteDetail = { 
+  detailListURL:'StoreItemTransformNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreItemTransformNoteDetail------------------ 
+export const StoreItemTransformNoteDetail = { 
   baseURL:'StoreItemTransformNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Item-Transform-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreItemTransformRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreItemTransformRequest------------------ 
+export const StoreItemTransformRequest = { 
   baseURL:'StoreItemTransformRequest/base',//主表-列表 
   detailURL:'app/Store-Item-Transform-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreItemTransformRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreItemTransformRequestDetail = { 
+  detailListURL:'StoreItemTransformRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreItemTransformRequestDetail------------------ 
+export const StoreItemTransformRequestDetail = { 
   baseURL:'StoreItemTransformRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Item-Transform-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreJisDeliverNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreJisDeliverNote------------------ 
+export const StoreJisDeliverNote = { 
   baseURL:'StoreJisDeliverNote/base',//主表-列表 
   detailURL:'app/Store-Jis-Deliver-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreJisDeliverNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreJisDeliverNoteDetail = { 
+  detailListURL:'StoreJisDeliverNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreJisDeliverNoteDetail------------------ 
+export const StoreJisDeliverNoteDetail = { 
   baseURL:'StoreJisDeliverNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Jis-Deliver-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreJisProductReceiptNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreJisProductReceiptNote------------------ 
+export const StoreJisProductReceiptNote = { 
   baseURL:'StoreJisProductReceiptNote/base',//主表-列表 
   detailURL:'app/Store-Jis-Product-Receipt-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreJisProductReceiptNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreJisProductReceiptNoteDetail = { 
+  detailListURL:'StoreJisProductReceiptNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreJisProductReceiptNoteDetail------------------ 
+export const StoreJisProductReceiptNoteDetail = { 
   baseURL:'StoreJisProductReceiptNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Jis-Product-Receipt-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreMaterialRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreMaterialRequest------------------ 
+export const StoreMaterialRequest = { 
   baseURL:'StoreMaterialRequest/base',//主表-列表 
   detailURL:'app/Store-Material-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreMaterialRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreMaterialRequestDetail = { 
+  detailListURL:'StoreMaterialRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreMaterialRequestDetail------------------ 
+export const StoreMaterialRequestDetail = { 
   baseURL:'StoreMaterialRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Material-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreNoOkConvertOkNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreNoOkConvertOkNote------------------ 
+export const StoreNoOkConvertOkNote = { 
   baseURL:'StoreNoOkConvertOkNote/base',//主表-列表 
   detailURL:'app/Store-No-Ok-Convert-Ok-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreNoOkConvertOkNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreNoOkConvertOkNoteDetail = { 
+  detailListURL:'StoreNoOkConvertOkNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreNoOkConvertOkNoteDetail------------------ 
+export const StoreNoOkConvertOkNoteDetail = { 
   baseURL:'StoreNoOkConvertOkNoteDetail/base',//主表-列表 
   detailURL:'app/Store-No-Ok-Convert-Ok-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreOfflineSettlementNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreOfflineSettlementNote------------------ 
+export const StoreOfflineSettlementNote = { 
   baseURL:'StoreOfflineSettlementNote/base',//主表-列表 
   detailURL:'app/Store-Offline-Settlement-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreOfflineSettlementNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreOfflineSettlementNoteDetail = { 
+  detailListURL:'StoreOfflineSettlementNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreOfflineSettlementNoteDetail------------------ 
+export const StoreOfflineSettlementNoteDetail = { 
   baseURL:'StoreOfflineSettlementNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Offline-Settlement-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StorePreparationPlan = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StorePreparationPlan------------------ 
+export const StorePreparationPlan = { 
   baseURL:'StorePreparationPlan/base',//主表-列表 
   detailURL:'app/Store-Preparation-Plan',//主表-明细 + 明细-查看主表 
-  detailListURL:'StorePreparationPlanDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StorePreparationPlanDetail = { 
+  detailListURL:'StorePreparationPlanDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StorePreparationPlanDetail------------------ 
+export const StorePreparationPlanDetail = { 
   baseURL:'StorePreparationPlanDetail/base',//主表-列表 
   detailURL:'app/Store-Preparation-Plan-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreProductionPlan = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreProductionPlan------------------ 
+export const StoreProductionPlan = { 
   baseURL:'StoreProductionPlan/base',//主表-列表 
   detailURL:'app/Store-Production-Plan',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreProductionPlanDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreProductionPlanDetail = { 
+  detailListURL:'StoreProductionPlanDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreProductionPlanDetail------------------ 
+export const StoreProductionPlanDetail = { 
   baseURL:'StoreProductionPlanDetail/base',//主表-列表 
   detailURL:'app/Store-Production-Plan-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreProductionReturnNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreProductionReturnNote------------------ 
+export const StoreProductionReturnNote = { 
   baseURL:'StoreProductionReturnNote/base',//主表-列表 
   detailURL:'app/Store-Production-Return-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreProductionReturnNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreProductionReturnNoteDetail = { 
+  detailListURL:'StoreProductionReturnNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreProductionReturnNoteDetail------------------ 
+export const StoreProductionReturnNoteDetail = { 
   baseURL:'StoreProductionReturnNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Production-Return-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreProductionReturnRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreProductionReturnRequest------------------ 
+export const StoreProductionReturnRequest = { 
   baseURL:'StoreProductionReturnRequest/base',//主表-列表 
   detailURL:'app/Store-Production-Return-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreProductionReturnRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreProductionReturnRequestDetail = { 
+  detailListURL:'StoreProductionReturnRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreProductionReturnRequestDetail------------------ 
+export const StoreProductionReturnRequestDetail = { 
   baseURL:'StoreProductionReturnRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Production-Return-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreProductL7partsNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreProductL7partsNote------------------ 
+export const StoreProductL7partsNote = { 
   baseURL:'StoreProductL7partsNote/base',//主表-列表 
   detailURL:'app/Store-Product-L7parts-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreProductL7partsNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreProductL7partsNoteDetail = { 
+  detailListURL:'StoreProductL7partsNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreProductL7partsNoteDetail------------------ 
+export const StoreProductL7partsNoteDetail = { 
   baseURL:'StoreProductL7partsNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Product-L7parts-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreProductReceiptNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreProductReceiptNote------------------ 
+export const StoreProductReceiptNote = { 
   baseURL:'StoreProductReceiptNote/base',//主表-列表 
   detailURL:'app/Store-Product-Receipt-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreProductReceiptNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreProductReceiptNoteDetail = { 
+  detailListURL:'StoreProductReceiptNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreProductReceiptNoteDetail------------------ 
+export const StoreProductReceiptNoteDetail = { 
   baseURL:'StoreProductReceiptNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Product-Receipt-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreProductReceiptRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreProductReceiptRequest------------------ 
+export const StoreProductReceiptRequest = { 
   baseURL:'StoreProductReceiptRequest/base',//主表-列表 
   detailURL:'app/Store-Product-Receipt-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreProductReceiptRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreProductReceiptRequestDetail = { 
+  detailListURL:'StoreProductReceiptRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreProductReceiptRequestDetail------------------ 
+export const StoreProductReceiptRequestDetail = { 
   baseURL:'StoreProductReceiptRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Product-Receipt-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreProductRecycleMaterialDetail = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreProductRecycleMaterialDetail------------------ 
+export const StoreProductRecycleMaterialDetail = { 
   baseURL:'StoreProductRecycleMaterialDetail/base',//主表-列表 
   detailURL:'app/Store-Product-Recycle-Material-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreProductRecycleNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreProductRecycleNote------------------ 
+export const StoreProductRecycleNote = { 
   baseURL:'StoreProductRecycleNote/base',//主表-列表 
   detailURL:'app/Store-Product-Recycle-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreProductRecycleNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreProductRecycleNoteDetail = { 
+  detailListURL:'StoreProductRecycleNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreProductRecycleNoteDetail------------------ 
+export const StoreProductRecycleNoteDetail = { 
   baseURL:'StoreProductRecycleNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Product-Recycle-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreProductRecycleRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreProductRecycleRequest------------------ 
+export const StoreProductRecycleRequest = { 
   baseURL:'StoreProductRecycleRequest/base',//主表-列表 
   detailURL:'app/Store-Product-Recycle-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreProductRecycleRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreProductRecycleRequestDetail = { 
+  detailListURL:'StoreProductRecycleRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreProductRecycleRequestDetail------------------ 
+export const StoreProductRecycleRequestDetail = { 
   baseURL:'StoreProductRecycleRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Product-Recycle-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StorePurchaseOrder = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StorePurchaseOrder------------------ 
+export const StorePurchaseOrder = { 
   baseURL:'StorePurchaseOrder/base',//主表-列表 
   detailURL:'app/Store-Purchase-Order',//主表-明细 + 明细-查看主表 
-  detailListURL:'StorePurchaseOrderDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StorePurchaseOrderDetail = { 
+  detailListURL:'StorePurchaseOrderDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StorePurchaseOrderDetail------------------ 
+export const StorePurchaseOrderDetail = { 
   baseURL:'StorePurchaseOrderDetail/base',//主表-列表 
   detailURL:'app/Store-Purchase-Order-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StorePurchaseReceiptNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StorePurchaseReceiptNote------------------ 
+export const StorePurchaseReceiptNote = { 
   baseURL:'StorePurchaseReceiptNote/base',//主表-列表 
   detailURL:'app/Store-Purchase-Receipt-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StorePurchaseReceiptNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StorePurchaseReceiptNoteDetail = { 
+  detailListURL:'StorePurchaseReceiptNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StorePurchaseReceiptNoteDetail------------------ 
+export const StorePurchaseReceiptNoteDetail = { 
   baseURL:'StorePurchaseReceiptNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Purchase-Receipt-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StorePurchaseReceiptRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StorePurchaseReceiptRequest------------------ 
+export const StorePurchaseReceiptRequest = { 
   baseURL:'StorePurchaseReceiptRequest/base',//主表-列表 
   detailURL:'app/Store-Purchase-Receipt-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StorePurchaseReceiptRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StorePurchaseReceiptRequestDetail = { 
+  detailListURL:'StorePurchaseReceiptRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StorePurchaseReceiptRequestDetail------------------ 
+export const StorePurchaseReceiptRequestDetail = { 
   baseURL:'StorePurchaseReceiptRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Purchase-Receipt-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StorePurchaseReturnNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StorePurchaseReturnNote------------------ 
+export const StorePurchaseReturnNote = { 
   baseURL:'StorePurchaseReturnNote/base',//主表-列表 
   detailURL:'app/Store-Purchase-Return-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StorePurchaseReturnNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StorePurchaseReturnNoteDetail = { 
+  detailListURL:'StorePurchaseReturnNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StorePurchaseReturnNoteDetail------------------ 
+export const StorePurchaseReturnNoteDetail = { 
   baseURL:'StorePurchaseReturnNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Purchase-Return-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StorePurchaseReturnRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StorePurchaseReturnRequest------------------ 
+export const StorePurchaseReturnRequest = { 
   baseURL:'StorePurchaseReturnRequest/base',//主表-列表 
   detailURL:'app/Store-Purchase-Return-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StorePurchaseReturnRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StorePurchaseReturnRequestDetail = { 
+  detailListURL:'StorePurchaseReturnRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StorePurchaseReturnRequestDetail------------------ 
+export const StorePurchaseReturnRequestDetail = { 
   baseURL:'StorePurchaseReturnRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Purchase-Return-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StorePutawayNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StorePutawayNote------------------ 
+export const StorePutawayNote = { 
   baseURL:'StorePutawayNote/base',//主表-列表 
   detailURL:'app/Store-Putaway-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StorePutawayNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StorePutawayNoteDetail = { 
+  detailListURL:'StorePutawayNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StorePutawayNoteDetail------------------ 
+export const StorePutawayNoteDetail = { 
   baseURL:'StorePutawayNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Putaway-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StorePutawayRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StorePutawayRequest------------------ 
+export const StorePutawayRequest = { 
   baseURL:'StorePutawayRequest/base',//主表-列表 
   detailURL:'app/Store-Putaway-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StorePutawayRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StorePutawayRequestDetail = { 
+  detailListURL:'StorePutawayRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StorePutawayRequestDetail------------------ 
+export const StorePutawayRequestDetail = { 
   baseURL:'StorePutawayRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Putaway-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreReceiptAbnormalNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreReceiptAbnormalNote------------------ 
+export const StoreReceiptAbnormalNote = { 
   baseURL:'StoreReceiptAbnormalNote/base',//主表-列表 
   detailURL:'app/Store-Receipt-Abnormal-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreReceiptAbnormalNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreReceiptAbnormalNoteDetail = { 
+  detailListURL:'StoreReceiptAbnormalNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreReceiptAbnormalNoteDetail------------------ 
+export const StoreReceiptAbnormalNoteDetail = { 
   baseURL:'StoreReceiptAbnormalNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Receipt-Abnormal-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreRecycledMaterialReceiptNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreRecycledMaterialReceiptNote------------------ 
+export const StoreRecycledMaterialReceiptNote = { 
   baseURL:'StoreRecycledMaterialReceiptNote/base',//主表-列表 
   detailURL:'app/Store-Recycled-Material-Receipt-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreRecycledMaterialReceiptNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreRecycledMaterialReceiptNoteDetail = { 
+  detailListURL:'StoreRecycledMaterialReceiptNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreRecycledMaterialReceiptNoteDetail------------------ 
+export const StoreRecycledMaterialReceiptNoteDetail = { 
   baseURL:'StoreRecycledMaterialReceiptNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Recycled-Material-Receipt-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreSaleOrder = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreSaleOrder------------------ 
+export const StoreSaleOrder = { 
   baseURL:'StoreSaleOrder/base',//主表-列表 
   detailURL:'app/Store-Sale-Order',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreSaleOrderDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreSaleOrderDetail = { 
+  detailListURL:'StoreSaleOrderDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreSaleOrderDetail------------------ 
+export const StoreSaleOrderDetail = { 
   baseURL:'StoreSaleOrderDetail/base',//主表-列表 
   detailURL:'app/Store-Sale-Order-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreScrapNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreScrapNote------------------ 
+export const StoreScrapNote = { 
   baseURL:'StoreScrapNote/base',//主表-列表 
   detailURL:'app/Store-Scrap-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreScrapNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreScrapNoteDetail = { 
+  detailListURL:'StoreScrapNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreScrapNoteDetail------------------ 
+export const StoreScrapNoteDetail = { 
   baseURL:'StoreScrapNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Scrap-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreScrapRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreScrapRequest------------------ 
+export const StoreScrapRequest = { 
   baseURL:'StoreScrapRequest/base',//主表-列表 
   detailURL:'app/Store-Scrap-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreScrapRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreScrapRequestDetail = { 
+  detailListURL:'StoreScrapRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreScrapRequestDetail------------------ 
+export const StoreScrapRequestDetail = { 
   baseURL:'StoreScrapRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Scrap-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreSupplierAsn = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreSupplierAsn------------------ 
+export const StoreSupplierAsn = { 
   baseURL:'StoreSupplierAsn/base',//主表-列表 
   detailURL:'app/Store-Supplier-Asn',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreSupplierAsnDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreSupplierAsnDetail = { 
+  detailListURL:'StoreSupplierAsnDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreSupplierAsnDetail------------------ 
+export const StoreSupplierAsnDetail = { 
   baseURL:'StoreSupplierAsnDetail/base',//主表-列表 
   detailURL:'app/Store-Supplier-Asn-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreTransferNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreTransferNote------------------ 
+export const StoreTransferNote = { 
   baseURL:'StoreTransferNote/base',//主表-列表 
   detailURL:'app/Store-Transfer-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreTransferNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreTransferNoteCopy = { 
-  baseURL:'StoreTransferNoteCopy/base',//主表-列表 
-  detailURL:'app/Store-Transfer-Note-Copy',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreTransferNoteDetail = { 
+  detailListURL:'StoreTransferNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreTransferNoteDetail------------------ 
+export const StoreTransferNoteDetail = { 
   baseURL:'StoreTransferNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Transfer-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreTransferNoteDetailCopy = { 
-  baseURL:'StoreTransferNoteDetailCopy/base',//主表-列表 
-  detailURL:'app/Store-Transfer-Note-Detail-Copy',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreTransferRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreTransferRequest------------------ 
+export const StoreTransferRequest = { 
   baseURL:'StoreTransferRequest/base',//主表-列表 
   detailURL:'app/Store-Transfer-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreTransferRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreTransferRequestDetail = { 
+  detailListURL:'StoreTransferRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreTransferRequestDetail------------------ 
+export const StoreTransferRequestDetail = { 
   baseURL:'StoreTransferRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Transfer-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreUnplannedIssueNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreUnplannedIssueNote------------------ 
+export const StoreUnplannedIssueNote = { 
   baseURL:'StoreUnplannedIssueNote/base',//主表-列表 
   detailURL:'app/Store-Unplanned-Issue-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreUnplannedIssueNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreUnplannedIssueNoteDetail = { 
+  detailListURL:'StoreUnplannedIssueNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreUnplannedIssueNoteDetail------------------ 
+export const StoreUnplannedIssueNoteDetail = { 
   baseURL:'StoreUnplannedIssueNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Unplanned-Issue-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreUnplannedIssueRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreUnplannedIssueRequest------------------ 
+export const StoreUnplannedIssueRequest = { 
   baseURL:'StoreUnplannedIssueRequest/base',//主表-列表 
   detailURL:'app/Store-Unplanned-Issue-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreUnplannedIssueRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreUnplannedIssueRequestDetail = { 
+  detailListURL:'StoreUnplannedIssueRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreUnplannedIssueRequestDetail------------------ 
+export const StoreUnplannedIssueRequestDetail = { 
   baseURL:'StoreUnplannedIssueRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Unplanned-Issue-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreUnplannedReceiptNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreUnplannedReceiptNote------------------ 
+export const StoreUnplannedReceiptNote = { 
   baseURL:'StoreUnplannedReceiptNote/base',//主表-列表 
   detailURL:'app/Store-Unplanned-Receipt-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreUnplannedReceiptNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreUnplannedReceiptNoteDetail = { 
+  detailListURL:'StoreUnplannedReceiptNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreUnplannedReceiptNoteDetail------------------ 
+export const StoreUnplannedReceiptNoteDetail = { 
   baseURL:'StoreUnplannedReceiptNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Unplanned-Receipt-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreUnplannedReceiptRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreUnplannedReceiptRequest------------------ 
+export const StoreUnplannedReceiptRequest = { 
   baseURL:'StoreUnplannedReceiptRequest/base',//主表-列表 
   detailURL:'app/Store-Unplanned-Receipt-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreUnplannedReceiptRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreUnplannedReceiptRequestDetail = { 
+  detailListURL:'StoreUnplannedReceiptRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreUnplannedReceiptRequestDetail------------------ 
+export const StoreUnplannedReceiptRequestDetail = { 
   baseURL:'StoreUnplannedReceiptRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Unplanned-Receipt-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreWarehouseTransferNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreWarehouseTransferNote------------------ 
+export const StoreWarehouseTransferNote = { 
   baseURL:'StoreWarehouseTransferNote/base',//主表-列表 
   detailURL:'app/Store-Warehouse-Transfer-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreWarehouseTransferNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreWarehouseTransferNoteDetail = { 
+  detailListURL:'StoreWarehouseTransferNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreWarehouseTransferNoteDetail------------------ 
+export const StoreWarehouseTransferNoteDetail = { 
   baseURL:'StoreWarehouseTransferNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Warehouse-Transfer-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreWipWarehouseAdjustNote = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreWipWarehouseAdjustNote------------------ 
+export const StoreWipWarehouseAdjustNote = { 
   baseURL:'StoreWipWarehouseAdjustNote/base',//主表-列表 
   detailURL:'app/Store-Wip-Warehouse-Adjust-Note',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreWipWarehouseAdjustNoteDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreWipWarehouseAdjustNoteDetail = { 
+  detailListURL:'StoreWipWarehouseAdjustNoteDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreWipWarehouseAdjustNoteDetail------------------ 
+export const StoreWipWarehouseAdjustNoteDetail = { 
   baseURL:'StoreWipWarehouseAdjustNoteDetail/base',//主表-列表 
   detailURL:'app/Store-Wip-Warehouse-Adjust-Note-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreWipWarehouseAdjustRequest = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreWipWarehouseAdjustRequest------------------ 
+export const StoreWipWarehouseAdjustRequest = { 
   baseURL:'StoreWipWarehouseAdjustRequest/base',//主表-列表 
   detailURL:'app/Store-Wip-Warehouse-Adjust-Request',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreWipWarehouseAdjustRequestDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreWipWarehouseAdjustRequestDetail = { 
+  detailListURL:'StoreWipWarehouseAdjustRequestDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreWipWarehouseAdjustRequestDetail------------------ 
+export const StoreWipWarehouseAdjustRequestDetail = { 
   baseURL:'StoreWipWarehouseAdjustRequestDetail/base',//主表-列表 
   detailURL:'app/Store-Wip-Warehouse-Adjust-Request-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const StoreWorkOrder = { 
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表 StoreWorkOrder------------------ 
+export const StoreWorkOrder = { 
   baseURL:'StoreWorkOrder/base',//主表-列表 
   detailURL:'app/Store-Work-Order',//主表-明细 + 明细-查看主表 
-  detailListURL:'StoreWorkOrderDetail/base',//明细-列表, 
-   masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const StoreWorkOrderDetail = { 
+  detailListURL:'StoreWorkOrderDetail/base',//明细-列表 
+  masterId:'masterId',//明细获取主表信息的masterId 
+  hasDetail:true, 
+  isMaster:true 
+} 
+//结束------------------------------------ 
+
+//开始------------------主表的明细 StoreWorkOrderDetail------------------ 
+export const StoreWorkOrderDetail = { 
   baseURL:'StoreWorkOrderDetail/base',//主表-列表 
   detailURL:'app/Store-Work-Order-Detail',//主表-明细 + 明细-查看主表 
- } 
- 
\ No newline at end of file
+  hasDetail:true, 
+  isMaster:false 
+} 
+//结束------------------------------------ 
+
diff --git a/WinIn.FasterZ.Wms.Fe/src/utils/index.js b/WinIn.FasterZ.Wms.Fe/src/utils/index.js
index 2c428cbee..c81e4f7c1 100644
--- a/WinIn.FasterZ.Wms.Fe/src/utils/index.js
+++ b/WinIn.FasterZ.Wms.Fe/src/utils/index.js
@@ -3,6 +3,7 @@
  */
  import {fileStorage, getPageList } from '@/api/wms-api'
  import store from '@/store'
+ import i18n from "@/lang"
  
  /**
   * @param {string} url
@@ -428,4 +429,101 @@
        return str.substring(0,1).toUpperCase() + str.substring(1,str.length);
      
    }
- }
\ No newline at end of file
+ }
+
+//  get-dto-column-type接口表头类型初始化
+export function initApiColumnsForDto (list,titleName,that) {
+  let data = that.$store.getters.dtoColumnTypes
+  let _coloums = data[titleName].S
+  let _Columns_Table = []
+  if(_coloums){
+    let _data = _coloums.dtoList
+    _data.forEach(item=>{
+      // 如果list接口存在数据 ，与list接口返回字段比较处理,list接口存在的话则追加
+      let _if = firstWordSizeChange(item.name) != 'details'
+      if(list){
+        _if = firstWordSizeChange(item.name) in list && firstWordSizeChange(item.name) != 'details'
+      }
+      if(_if){
+        _Columns_Table.push(item)
+      }
+    })
+  }
+  if(list){
+    _Columns_Table = _Columns_Table.concat(specialAddColumns(list,titleName))
+  }
+  return _Columns_Table
+}
+
+// 特殊字段转义处理（api中没有的字段特殊处理）
+export function specialAddColumns(list,titleName){
+  let _apiName = titleName
+  let _special_list=[]
+  // creationTime
+  if('creationTime' in list){
+    _special_list.push(
+      {
+        "name": "CreationTime",
+        "apiBaseType": "datetime",
+        "baseApiName": _apiName + 'CreationTime',
+        "label": zhApiColumnsLable(_apiName + 'CreationTime') || i18n.t('columNames.CreationTime'),
+        "prop": "creationTime",
+      }
+    )
+  }
+  // creatorId
+  if('creatorId' in list){
+    _special_list.push(
+      {
+        "name": "CreatorId",
+        "apiBaseType": "string",
+        "baseApiName": _apiName + 'CreatorId',
+        "label": zhApiColumnsLable(_apiName + 'CreatorId') || i18n.t('columNames.CreatorId'),
+        "prop": "creatorId",
+      }
+    )
+  }
+  // lastModificationTime
+  if('lastModificationTime' in list){
+    _special_list.push(
+      {
+        "name": "LastModificationTime",
+        "apiBaseType": "datetime",
+        "baseApiName": _apiName + 'LastModificationTime',
+        "label": zhApiColumnsLable(_apiName + 'LastModificationTime') || i18n.t('columNames.LastModificationTime'),
+        "prop": "lastModificationTime",
+      }
+    )
+  }
+  // lastModifierId
+  if('lastModifierId' in list){
+    _special_list.push(
+      {
+        "name": "LastModifierId",
+        "apiBaseType": "string",
+        "baseApiName": _apiName + 'LastModifierId',
+        "label": zhApiColumnsLable(_apiName + 'LastModifierId') || i18n.t('columNames.LastModifierId'),
+        "prop": "lastModifierId",
+      }
+    )
+  }
+  // tenantId
+  if('tenantId' in list){
+    _special_list.push(
+      {
+        "name": "TenantId",
+        "apiBaseType": "string",
+        "baseApiName": _apiName + 'TenantId',
+        "label": zhApiColumnsLable(_apiName + 'TenantId') || i18n.t('columNames.TenantId'),
+        "prop": "tenantId",
+      }
+    )
+  }
+  return _special_list
+}
+
+// 从字段中删除最后某字段
+export function sliceStrEndDelete(str,deleteStr){
+  let _d_l = str.length - deleteStr.length
+  return str.slice(0,_d_l)
+}
\ No newline at end of file
diff --git a/WinIn.FasterZ.Wms.Fe/src/utils/request.js b/WinIn.FasterZ.Wms.Fe/src/utils/request.js
index b1773c59c..f43af220e 100644
--- a/WinIn.FasterZ.Wms.Fe/src/utils/request.js
+++ b/WinIn.FasterZ.Wms.Fe/src/utils/request.js
@@ -102,14 +102,16 @@ service.interceptors.response.use(
     // }
     let err = error.response.data.error // for debug
     if (err && err.validationErrors) {
+      let _err_sum = ""
       for (let item in err.validationErrors) {
-        Message({
-          message: err.validationErrors[item].message,
-          type: 'error',
-          duration: 3 * 1000,
-          showClose:true
-        })
+        _err_sum += err.validationErrors[item].message + '<br/>'
       }
+      Message({
+        message: _err_sum,
+        type: 'error',
+        duration: 5 * 1000,
+        dangerouslyUseHTMLString: true
+      })
     } else {
       console.log(err)
       // 用户登录，用户名密码错误，报400，后端返回 invalid_grant 信息，令牌受限
diff --git a/WinIn.FasterZ.Wms.Fe/src/views/demo/demo_MAndD.vue b/WinIn.FasterZ.Wms.Fe/src/views/demo/demo_MAndD.vue
new file mode 100644
index 000000000..341679c7c
--- /dev/null
+++ b/WinIn.FasterZ.Wms.Fe/src/views/demo/demo_MAndD.vue
@@ -0,0 +1,122 @@
+      
+<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"
+      :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_right="(data)=>{return buttonOperationList_rightApi(data,'edit|delete')}"
+      @buttonOperationClick_right="buttonOperationClick_right"
+    ></tablePagination>
+    <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>
+    <!-- 明细查询页面 -->
+    <filterForDetailPage
+      v-if="filterForDetailShow"
+      :parentColumns="apiColumns_Table"
+      @closeDialog="changeFilterForDetailShow"
+    ></filterForDetailPage>
+    <!-- 导出弹窗 -->
+    <exportDrop 
+      v-if="displayDialog.exportDialog"
+      @closeDialog="closeExportDrop"
+      @exportDropSubmit="exportDropSubmit"
+    ></exportDrop>
+    <!-- Api新增 -->
+    <addEditFromApiPop
+      v-if="displayDialog.addEditApiDialog"
+      :handleType="addEditApiType"
+      :editRowData="editFromApiRowData"
+      @closePop="closeAddEditApiPop"
+      @exitAfterHandle="paging"
+    ></addEditFromApiPop>
+  </div>
+</template>
+<script>
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { mixins } from "@/mixins/mixins";
+import { filterSelectMixins } from '@/mixins/filter-Select'
+
+export default {
+  name: "StoreWorkOrder",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+  ],
+  data() {
+    return {
+      //常用按钮数据
+      currenButtonData: [
+        this.defaultAddBtn(
+          { name:'addFromApi'}
+        ),//新增
+        this.defaultExportBtn({
+          isRedundance:true,
+          isDetailExport:true
+        }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+        this.defaultFilterForDetailBtn(),//明细查询按钮
+      ],
+    };
+  },
+  mounted() {
+    this.paging();
+  },
+}
+</script>
+<style lang="scss" scoped>
+@import "@/styles/basicData.scss";
+</style>
+
+    
+
diff --git a/WinIn.FasterZ.Wms.Fe/src/views/demo/demo_onlyD.vue b/WinIn.FasterZ.Wms.Fe/src/views/demo/demo_onlyD.vue
new file mode 100644
index 000000000..a8a505b0b
--- /dev/null
+++ b/WinIn.FasterZ.Wms.Fe/src/views/demo/demo_onlyD.vue
@@ -0,0 +1,113 @@
+<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"
+      :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_right="(data)=>{return buttonOperationList_rightApi(data,'edit|delete')}"
+      @buttonOperationClick_right="buttonOperationClick_right"
+    ></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>
+    <!-- Api新增 -->
+    <addEditFromApiPop
+      v-if="displayDialog.addEditApiDialog"
+      :handleType="addEditApiType"
+      :editRowData="editFromApiRowData"
+      @closePop="closeAddEditApiPop"
+      @exitAfterHandle="paging"
+    ></addEditFromApiPop>
+  </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'
+
+
+export default {
+  name: "StoreWorkOrderDetail",
+  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>
\ No newline at end of file
diff --git a/WinIn.FasterZ.Wms.Fe/src/views/demo/demo_onlyM.vue b/WinIn.FasterZ.Wms.Fe/src/views/demo/demo_onlyM.vue
new file mode 100644
index 000000000..9b5d9f868
--- /dev/null
+++ b/WinIn.FasterZ.Wms.Fe/src/views/demo/demo_onlyM.vue
@@ -0,0 +1,116 @@
+<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"
+      :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_right="(data)=>{return buttonOperationList_rightApi(data,'edit|delete')}"
+      @buttonOperationClick_right="buttonOperationClick_right"
+    ></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>
+    <!-- Api新增 -->
+    <addEditFromApiPop
+      v-if="displayDialog.addEditApiDialog"
+      :handleType="addEditApiType"
+      :editRowData="editFromApiRowData"
+      @closePop="closeAddEditApiPop"
+      @exitAfterHandle="paging"
+    ></addEditFromApiPop>
+  </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'
+
+
+export default {
+  name: "AuthDepartment",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+    newAndEdiDialogMixins
+  ],
+  data() {
+    return {
+      //常用按钮数据
+      currenButtonData: [
+        this.defaultAddBtn(
+          { name:'addFromApi'}
+        ),//新增
+        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>
\ No newline at end of file
diff --git a/WinIn.FasterZ.Wms.Fe/src/views/menuList/AuthDepartment.vue b/WinIn.FasterZ.Wms.Fe/src/views/menuList/AuthDepartment.vue
index 3851761a6..9b5d9f868 100644
--- a/WinIn.FasterZ.Wms.Fe/src/views/menuList/AuthDepartment.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/views/menuList/AuthDepartment.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- 没有子表的主表 -->
   <div class="page-box" v-loading="Loading.tableLoading">
     <tablePagination
       v-if="apiColumns_Table"
@@ -25,6 +26,8 @@
       :httpOverallSearchData="httpOverallSearchData"
       :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_right="(data)=>{return buttonOperationList_rightApi(data,'edit|delete')}"
+      @buttonOperationClick_right="buttonOperationClick_right"
     ></tablePagination>
     <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left" -->
@@ -55,6 +58,14 @@
       @closeDialog="closeExportDrop"
       @exportDropSubmit="exportDropSubmit"
     ></exportDrop>
+    <!-- Api新增 -->
+    <addEditFromApiPop
+      v-if="displayDialog.addEditApiDialog"
+      :handleType="addEditApiType"
+      :editRowData="editFromApiRowData"
+      @closePop="closeAddEditApiPop"
+      @exitAfterHandle="paging"
+    ></addEditFromApiPop>
   </div>
 </template>
 <script>
@@ -82,6 +93,9 @@ export default {
     return {
       //常用按钮数据
       currenButtonData: [
+        this.defaultAddBtn(
+          { name:'addFromApi'}
+        ),//新增
         this.defaultExportBtn({
           isRedundance:true,
           isDetailExport:true
diff --git a/WinIn.FasterZ.Wms.Fe/src/views/menuList/StoreWorkOrder.vue b/WinIn.FasterZ.Wms.Fe/src/views/menuList/StoreWorkOrder.vue
index 9f73dd068..341679c7c 100644
--- a/WinIn.FasterZ.Wms.Fe/src/views/menuList/StoreWorkOrder.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/views/menuList/StoreWorkOrder.vue
@@ -1,5 +1,6 @@
       
 <template>
+  <!-- 有子表的主表 -->
   <div class="page-box" v-loading="Loading.tableLoading">
     <tablePagination
       v-if="apiColumns_Table"
@@ -26,6 +27,8 @@
       :httpOverallSearchData="httpOverallSearchData"
       :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_right="(data)=>{return buttonOperationList_rightApi(data,'edit|delete')}"
+      @buttonOperationClick_right="buttonOperationClick_right"
     ></tablePagination>
     <curren-Drawer
       ref="currenDrawer_Ref"
@@ -60,6 +63,14 @@
       @closeDialog="closeExportDrop"
       @exportDropSubmit="exportDropSubmit"
     ></exportDrop>
+    <!-- Api新增 -->
+    <addEditFromApiPop
+      v-if="displayDialog.addEditApiDialog"
+      :handleType="addEditApiType"
+      :editRowData="editFromApiRowData"
+      @closePop="closeAddEditApiPop"
+      @exitAfterHandle="paging"
+    ></addEditFromApiPop>
   </div>
 </template>
 <script>
@@ -84,6 +95,9 @@ export default {
     return {
       //常用按钮数据
       currenButtonData: [
+        this.defaultAddBtn(
+          { name:'addFromApi'}
+        ),//新增
         this.defaultExportBtn({
           isRedundance:true,
           isDetailExport:true
@@ -91,7 +105,7 @@ export default {
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
-        this.defaultFilterForDetailBtn()//明细查询按钮
+        this.defaultFilterForDetailBtn(),//明细查询按钮
       ],
     };
   },
diff --git a/WinIn.FasterZ.Wms.Fe/src/views/menuList/StoreWorkOrderDetail.vue b/WinIn.FasterZ.Wms.Fe/src/views/menuList/StoreWorkOrderDetail.vue
index 9dbafbeb4..a8a505b0b 100644
--- a/WinIn.FasterZ.Wms.Fe/src/views/menuList/StoreWorkOrderDetail.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/views/menuList/StoreWorkOrderDetail.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- 子表 -->
   <div class="page-box" v-loading="Loading.tableLoading">
     <tablePagination
       v-if="apiColumns_Table"
@@ -25,6 +26,8 @@
       :httpOverallSearchData="httpOverallSearchData"
       :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_right="(data)=>{return buttonOperationList_rightApi(data,'edit|delete')}"
+      @buttonOperationClick_right="buttonOperationClick_right"
     ></tablePagination>
     <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left" -->
@@ -55,6 +58,14 @@
       @closeDialog="closeExportDrop"
       @exportDropSubmit="exportDropSubmit"
     ></exportDrop>
+    <!-- Api新增 -->
+    <addEditFromApiPop
+      v-if="displayDialog.addEditApiDialog"
+      :handleType="addEditApiType"
+      :editRowData="editFromApiRowData"
+      @closePop="closeAddEditApiPop"
+      @exitAfterHandle="paging"
+    ></addEditFromApiPop>
   </div>
 </template>
 <script>
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 60f0bf97e..d5e540428 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -2586,6 +2586,49 @@ export const InventoryBalance = [
   { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
   { label: "最后事务编号", prop: 'lastTransNumber' },
 ]
+
+// 库存余额(解/冻) 20230407
+export const InventoryBalanceActive = [
+  {
+    label: "物品代码",
+    prop: "itemCode",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "物品名称", prop: 'itemName' },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "配置", prop: "item_configurationFromFE" },
+  { label: "库存数量", prop: "qty" },
+  { label: "计量单位", prop: "uom" },
+  { label: "批次", prop: "lot" },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
+  { label: "箱码", prop: "packingCode" },
+  { label: "ERP储位", prop: "locationErpCode" },
+  { label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "生产日期", prop: "produceDate" ,type: "dateTime" },
+  { label: "入库时间", prop: "putInTime", type: "dateTime" },
+  { label: "过期日期", prop: "expireDate" ,type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "最后盘点时间", prop: "lastCountTime",type: "dateTime" },
+  { label: "最后盘点计划单号", prop: "lastCountPlanNumber",width: orderWidth },	
+  { label: "最后盘点标签", prop: "lastCountLabel" },
+  { label: "标包数量", prop: "stdPackQty" },
+  { label: "库位组", prop: "locationGroup" },
+  { label: "库区", prop: "locationArea" },
+  { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
+  { label: "序号", prop: "serialNumber" },
+  { label: "备注", prop: "remark" },
+  { label: "到货日期", prop: "arriveDate",type: "dateTime" },
+  { label: "供应商批次", prop: "supplierBatch" },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
+  { label: "最后事务编号", prop: 'lastTransNumber' },
+]
+
 // 库存事务 20230410
 export const InventoryTransaction = [
   {
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 793f3f604..3b00cdd02 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -1800,6 +1800,47 @@ export const InventoryInitialNote = [
   // { label: "ID", prop: 'id' },
   // ************** 确认隐藏 ************************
 ]
+// 库存余额(解/冻)
+export const InventoryBalanceActive = [
+  { label: "物品代码", prop: 'itemCode' },
+  { label: "物品名称", prop: "itemName" },
+  { label: "库存数量", prop: "qty" },
+  { label: "计量单位", prop: "uom" },
+  { label: "批次", prop: 'lot' },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "库存状态", prop: "status",type: "filter",  filters: "inventoryStage" },
+  { label: "箱码", prop: 'packingCode' },
+  { label: "ERP储位", prop: "locationErpCode" },
+  { label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "生产日期", prop: "produceDate" ,type: "dateTime" },
+  { label: "入库时间", prop: "putInTime", type: "dateTime" },
+  { label: "过期日期", prop: "expireDate" ,type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" },
+  { label: "最后盘点计划单号", prop: "lastCountPlanNumber" },
+  { label: "最后盘点标签号", prop: "lastCountLabel" },
+  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "标包数量", prop: 'stdPackQty' },
+  { label: "供应商批次", prop: 'supplierBatch' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "序号", prop: "serialNumber" },
+  { label: "备注", prop: 'remark' },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "最后事务编号", prop: "lastTransNumber" },
+  { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
+  { label: "库区", prop: "locationArea" },
+  { label: "库位组", prop: "locationGroup" },
+  { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
+  { label: "到货时间", prop: "arriveDate",type:"dateTime" },
+  { label: "仓库代码", prop: "warehouseCode" },
+  // ************** 确认隐藏 ************************
+  // { label: "ID", prop: 'id' },
+  // ************** 确认隐藏 ************************
+]
+
 // 库存事务 20230410
 export const InventoryTransaction = [
   { label: "事务编号", prop: "transNumber" },
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
index b13a85389..d95b07e6a 100644
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="page-box" v-loading="Loading.appMainLoading">
+    <!-- 无批量启用的【库存余额】页面 -->
     <tablePagination
       :currenButtonData="currenButtonData"
       :tableData="tableData"
@@ -9,7 +10,7 @@
       :totalCount="totalCount"
       :multipleSelection="multipleSelection"
       :MaxResultCount="PageListParams.MaxResultCount"
-      @topbutton="topbuttonHandle"
+      @topbutton="topbutton"
       @inlineDialog="inlineDialog"
       @sortChange="sortChange"
       @alertoldSkipCount="alertoldSkipCount"
@@ -22,7 +23,6 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
-      :tableSelection="true"
     >
     </tablePagination>
     <!-- 新增与编辑 -->
@@ -107,14 +107,6 @@ export default {
       currenButtonData: [
         this.defaultImportBtn(),//导入
         this.defaultExportBtn(),//导出
-        {
-          type: "success",
-          icon: "el-icon-check",
-          label: "批量启用",
-          name: "batch-active",
-          size: "mini",
-          background:"#31bb99"
-        },
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
@@ -207,37 +199,6 @@ export default {
         });
       }
     },
-    topbuttonHandle(val,item){
-      // 批量操作
-      if(val == 'batch-active'){
-        if(!this.multipleSelection || this.multipleSelection.length <= 0){
-          this.$warningMsg('请选择数据')
-          return
-        }
-        this.$confirm('此操作将启用已选 ('+this.multipleSelection.length+'条) 数据, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        }).then(() => {
-          this.Loading.tableLoading = true
-          let _ajaxs = []
-          this.multipleSelection.forEach(item=>{
-            _ajaxs.push(inventoryBalanceActive({id: item.id}))
-          })
-          Promise.all(_ajaxs).then((allData) => {
-            this.$successMsg('启用成功!')
-            this.Loading.tableLoading = false
-            this.paging()
-          }).catch((err)=>{
-            this.Loading.tableLoading = false
-          })
-        }).catch((err) => {
-          console.log(err)
-        });
-      }else{
-        this.topbutton(val,item)
-      }
-    },
     //抽屉下拉按钮操作 库存余额删除 只能删除库存数量为0的记录
     // drawerHandle(val) {
     //   if (val == 'delete') {
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalanceEdit.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalanceEdit.vue
new file mode 100644
index 000000000..c43bd54d4
--- /dev/null
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalanceEdit.vue
@@ -0,0 +1,290 @@
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <!-- 有批量启用的【库存余额(解/冻)】页面 -->
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbuttonHandle"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+      :tableSelection="true"
+    >
+    </tablePagination>
+    <!-- 新增与编辑 -->
+    <!-- <newAndEdiDialog
+      :loading="Loading.newAndEdiLoading"
+      :active="active"
+      :pageStatus="pageStatus"
+      :formReveal="formReveal"
+      :formTitle="formTitle"
+      :displayDialog="editDialog"
+      :FormData="editFormData"
+      :Form="editForm"
+      :Options="editOptions"
+      :Handle="editHandle"
+      :Rules="editRules"
+      @FormSubmit="FormClick(arguments)"
+      @close="FormClose"
+      @goBack="goBack"
+    ></newAndEdiDialog> -->
+     <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <curren-Drawer
+      :title="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :Butttondata="DrawerButtonData"
+      :propsData="propsData"
+      :tabsDesTions="tabsDesTions"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+    ></curren-Drawer>
+  </div>
+</template>
+<script>
+import { updateExpireDate, postDelete ,getDetailed,inventoryBalanceActive } from "@/api/wms-api"
+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"
+export default {
+  name: "InventoryBalanceActive",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    newAndEdiDialogMixins
+  ],
+  computed: {
+    editDialog: {
+      get: function () {
+        return this.displayDialog.newDialog || this.displayDialog.editDialog;
+      },
+    },
+    //按钮显示
+    hideButton: function () {
+      return function () {
+        return this.propsData.isActive
+      }
+    },
+  },
+  data () {
+    return {
+      showTableBaseFromFE:['configuration'],
+      URL: 'wms/inventory/inventory-balance',
+      //常用按钮数据
+      currenButtonData: [
+        this.defaultImportBtn(),//导入
+        this.defaultExportBtn(),//导出
+        {
+          type: "success",
+          icon: "el-icon-check",
+          label: "批量启用",
+          name: "batch-active",
+          size: "mini",
+          background:"#31bb99"
+        },
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+      DrawerButtonData: [
+        {
+          type: 'success',
+          icon: 'el-icon-check',
+          label: '启用',
+          hide: () => { return this.hideButton() },
+          name: "active",
+          size: 'mini'
+        },
+      ],
+      //编辑
+      // editFormData: {
+      //   id: null,
+      //   itemCode: null,
+      //   itemName: null,
+      //   itemDesc1: null,
+      //   itemDesc2: null,
+      //   produceDate: null,
+      //   expireDate: null,
+      //   locationCode: null,
+      //   status: 1,
+      //   lot: true,
+      //   packingCode: true,
+      //   containerCode: null,
+      //   qty: null,
+      //   locationArea: null,
+      //   locationGroup: null,
+      //   locationErpCode: null,
+      //   putInTime: null,
+      // },
+      // editOptions: {},
+      // CreateForm: [
+      //   { type: "input", label: "箱标签", prop: 'packingCode', colSpan: 12 },
+      //   { type: "input", label: "排序依次", prop: 'sortingBase', colSpan: 12 },
+      //   { type: "input", label: "序号", prop: 'serialNumber', colSpan: 12 },
+      //   { type: "input", label: "最后盘点计划", prop: 'lastCountPlanNumber', colSpan: 12 },
+      //   { type: "input", label: "最后盘点标签", prop: 'lastCountLabel', colSpan: 12 },
+      //   { type: "input", label: "物品代码", prop: 'itemCode', colSpan: 12 },
+      //   { type: "input", label: "批次编号", prop: 'batchCode', colSpan: 12 },
+      //   { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+      // ],
+      // editForm: [
+      //   { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
+      //   { type: "input", label: "物品名称", prop: "itemName", disabled:true, colSpan: 12 },
+      //   { type: "input", label: "库位代码", prop: "locationCode", disabled:true, colSpan: 12 },
+      //   { type: "input", label: "批次", prop: "lot", disabled:true, colSpan: 12 },
+      //   { type: "input", label: "箱标签", prop: "packingCode", disabled:true, colSpan: 12 },
+      //   { type: "input", label: "库区", prop: "locationArea", disabled:true, colSpan: 12 },
+      //   { type: "input", label: "库位组", prop: "locationGroup", disabled:true, colSpan: 12 },
+      //   { type: "dateTime", label: "入库时间", prop: "putInTime", disabled:true, colSpan: 12 },
+      //   { type: "dateTime", label: "生产日期", prop: "produceDate", disabled:true, colSpan: 12 },
+      //   { type: "dateTime", label: "过期日期", prop: "expireDate", colSpan: 12 },
+      // ],
+      // editRules: {
+      //   expireDate: [{ required: true, trigger: "blur", message: "不可为空" }],
+      // },
+    };
+  },
+  mounted () {
+    this.paging();
+  },
+  methods: {
+    drawerbutton(val){
+      // 启用
+      if(val == "active"){
+        this.$confirm('此操作将启用该数据, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+            this.Loading.appMainLoading = true
+            inventoryBalanceActive({id: this.propsData.id}).then(res => {
+              this.$successMsg('启用成功!')
+              this.Loading.appMainLoading = false
+              this.displayDialog.detailsDialog = false
+              this.paging()
+              // getDetailed(this.propsData.id, this.URL).then(res => {
+              //   this.propsData = res
+              //   this.Loading.DrawerLoading = false
+              // })
+            }).catch(err => {
+              this.Loading.appMainLoading = false
+            })
+        }).catch((err) => {
+          console.log(err)
+        });
+      }
+    },
+    topbuttonHandle(val,item){
+      // 批量操作
+      if(val == 'batch-active'){
+        if(!this.multipleSelection || this.multipleSelection.length <= 0){
+          this.$warningMsg('请选择数据')
+          return
+        }
+        this.$confirm('此操作将启用已选 ('+this.multipleSelection.length+'条) 数据, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+          this.Loading.tableLoading = true
+          let _ajaxs = []
+          this.multipleSelection.forEach(item=>{
+            _ajaxs.push(inventoryBalanceActive({id: item.id}))
+          })
+          Promise.all(_ajaxs).then((allData) => {
+            this.$successMsg('启用成功!')
+            this.Loading.tableLoading = false
+            this.paging()
+          }).catch((err)=>{
+            this.Loading.tableLoading = false
+          })
+        }).catch((err) => {
+          console.log(err)
+        });
+      }else{
+        this.topbutton(val,item)
+      }
+    },
+    //抽屉下拉按钮操作 库存余额删除 只能删除库存数量为0的记录
+    // drawerHandle(val) {
+    //   if (val == 'delete') {
+    //     if (this.propsData.qty == '0') {
+    //       this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', {
+    //         confirmButtonText: '确定',
+    //         cancelButtonText: '取消',
+    //         type: 'warning'
+    //       }).then(() => {
+    //         this.Loading.appMainLoading = true
+    //         this.displayDialog.detailsDialog = false
+    //         postDelete(this.propsData.id, this.URL).then(res => {
+    //           this.$successMsg('删除成功!')
+    //           this.Loading.appMainLoading = false
+    //           this.paging()
+    //         }).catch(err => {
+    //           this.Loading.appMainLoading = false
+    //         })
+    //       }).catch(() => {
+    //       });
+    //     } else {
+    //       this.$message({
+    //         message: "只能删除库存数量为 0 的记录！！",
+    //         type: "warning",
+    //       });
+    //     }
+    //   }
+    // },
+    //点击表单提交(新增或编辑)
+    // FormClick (val) {
+    //   let params = {
+    //     id: this.editFormData.id,
+    //     expireDate: this.editFormData.expireDate
+    //   }
+    //   updateExpireDate(params, this.URL).then( res => {
+    //     this.displayDialog.editDialog = false
+    //     this.$message.success("修改成功！");
+    //     this.paging();
+    //   }).catch( err => {
+    //     this.$message.success("修改失败！");
+    //     console.log(err)
+    //   })
+    // }
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "../../../styles/basicData.scss";
+</style>
\ No newline at end of file