llj
昨天 8cd0e22e4a194252c4639bebdec59f565f393f93
修复
7个文件已修改
315 ■■■■ 已修改文件
src/store/modules/permission.js 231 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/basicModeling/Gy_MouldFile.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/store/modules/permission.js
@@ -1288,6 +1288,36 @@
                redirect: "noRedirect",
                component: "Layout",
                children: [
                   {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "容器领用申请单维护",
                    },
                    component: () =>
                      import(
                        "@/views/scMould/warehouse/Sc_MouldOutRequestBillList"
                      ),
                    hidden: false,
                    name: "Sc_MouldOutRequestBillList",
                    path: "Sc_MouldOutRequestBillList",
                  },
                  // {
                  //   meta: {
                  //     icon: "build",
                  //     link: null,
                  //     noCache: false,
                  //     title: "容器领用申请单",
                  //   },
                  //   component: () =>
                  //     import(
                  //       "@/views/scMould/warehouse/Sc_MouldOutRequestBillEdit"
                  //     ),
                  //   hidden: false,
                  //   name: "Sc_MouldOutRequestBillEdit",
                  //   path: "Sc_MouldOutRequestBillEdit",
                  // },
                  {
                    meta: {
                      icon: "build",
@@ -1303,81 +1333,21 @@
                    name: "Sc_MouldProdOutBillList",
                    path: "Sc_MouldProdOutBillList",
                  },
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "容器领用出库单",
                    },
                    component: () =>
                      import(
                        "@/views/scMould/warehouse/Sc_MouldProdOutBillEdit"
                      ),
                    hidden: false,
                    name: "Sc_MouldProdOutBillEdit",
                    path: "Sc_MouldProdOutBillEdit",
                  },
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "容器入库单维护",
                    },
                    component: () =>
                      import(
                        "@/views/scMould/warehouse/Sc_MouldProdBackBillList"
                      ),
                    hidden: false,
                    name: "Sc_MouldProdBackBillList",
                    path: "Sc_MouldProdBackBillList",
                  },
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "容器入库单",
                    },
                    component: () =>
                      import(
                        "@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"
                      ),
                    hidden: false,
                    name: "Sc_MouldProdBackBillEdit",
                    path: "Sc_MouldProdBackBillEdit",
                  },
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "容器直接调拨单维护",
                    },
                    component: () =>
                      import(
                        "@/views/scMould/warehouse/Sc_MouldProdMoveBillList"
                      ),
                    hidden: false,
                    name: "Sc_MouldProdMoveBillList",
                    path: "Sc_MouldProdMoveBillList",
                  },
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "容器直接调拨单",
                    },
                    component: () =>
                      import(
                        "@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit"
                      ),
                    hidden: false,
                    name: "Sc_MouldProdMoveBillEdit",
                    path: "Sc_MouldProdMoveBillEdit",
                  },
                  // {
                  //   meta: {
                  //     icon: "build",
                  //     link: null,
                  //     noCache: false,
                  //     title: "容器领用出库单",
                  //   },
                  //   component: () =>
                  //     import(
                  //       "@/views/scMould/warehouse/Sc_MouldProdOutBillEdit"
                  //     ),
                  //   hidden: false,
                  //   name: "Sc_MouldProdOutBillEdit",
                  //   path: "Sc_MouldProdOutBillEdit",
                  // },
                  {
                    meta: {
                      icon: "build",
@@ -1393,52 +1363,52 @@
                    name: "Sc_MouldInRequestBillList",
                    path: "Sc_MouldInRequestBillList",
                  },
                  // {
                  //   meta: {
                  //     icon: "build",
                  //     link: null,
                  //     noCache: false,
                  //     title: "容器入库申请单",
                  //   },
                  //   component: () =>
                  //     import(
                  //       "@/views/scMould/warehouse/Sc_MouldInRequestBillEdit"
                  //     ),
                  //   hidden: false,
                  //   name: "Sc_MouldInRequestBillEdit",
                  //   path: "Sc_MouldInRequestBillEdit",
                  // },
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "容器入库申请单",
                      title: "容器入库单维护",
                    },
                    component: () =>
                      import(
                        "@/views/scMould/warehouse/Sc_MouldInRequestBillEdit"
                        "@/views/scMould/warehouse/Sc_MouldProdBackBillList"
                      ),
                    hidden: false,
                    name: "Sc_MouldInRequestBillEdit",
                    path: "Sc_MouldInRequestBillEdit",
                    name: "Sc_MouldProdBackBillList",
                    path: "Sc_MouldProdBackBillList",
                  },
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "容器领用申请单维护",
                    },
                    component: () =>
                      import(
                        "@/views/scMould/warehouse/Sc_MouldOutRequestBillList"
                      ),
                    hidden: false,
                    name: "Sc_MouldOutRequestBillList",
                    path: "Sc_MouldOutRequestBillList",
                  },
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "容器领用申请单",
                    },
                    component: () =>
                      import(
                        "@/views/scMould/warehouse/Sc_MouldOutRequestBillEdit"
                      ),
                    hidden: false,
                    name: "Sc_MouldOutRequestBillEdit",
                    path: "Sc_MouldOutRequestBillEdit",
                  },
                  {
                  // {
                  //   meta: {
                  //     icon: "build",
                  //     link: null,
                  //     noCache: false,
                  //     title: "容器入库单",
                  //   },
                  //   component: () =>
                  //     import(
                  //       "@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"
                  //     ),
                  //   hidden: false,
                  //   name: "Sc_MouldProdBackBillEdit",
                  //   path: "Sc_MouldProdBackBillEdit",
                  // },
                     {
                    meta: {
                      icon: "build",
                      link: null,
@@ -1453,21 +1423,54 @@
                    name: "Sc_MouldMoveStockRequestBillList",
                    path: "Sc_MouldMoveStockRequestBillList",
                  },
                  // {
                  //   meta: {
                  //     icon: "build",
                  //     link: null,
                  //     noCache: false,
                  //     title: "容器调拨申请单",
                  //   },
                  //   component: () =>
                  //     import(
                  //       "@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit"
                  //     ),
                  //   hidden: false,
                  //   name: "Sc_MouldMoveStockRequestBillEdit",
                  //   path: "Sc_MouldMoveStockRequestBillEdit",
                  // },
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "容器调拨申请单",
                      title: "容器直接调拨单维护",
                    },
                    component: () =>
                      import(
                        "@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit"
                        "@/views/scMould/warehouse/Sc_MouldProdMoveBillList"
                      ),
                    hidden: false,
                    name: "Sc_MouldMoveStockRequestBillEdit",
                    path: "Sc_MouldMoveStockRequestBillEdit",
                    name: "Sc_MouldProdMoveBillList",
                    path: "Sc_MouldProdMoveBillList",
                  },
                  // {
                  //   meta: {
                  //     icon: "build",
                  //     link: null,
                  //     noCache: false,
                  //     title: "容器直接调拨单",
                  //   },
                  //   component: () =>
                  //     import(
                  //       "@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit"
                  //     ),
                  //   hidden: false,
                  //   name: "Sc_MouldProdMoveBillEdit",
                  //   path: "Sc_MouldProdMoveBillEdit",
                  // },
                ],
              },
              {
src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -113,7 +113,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="托标准容器数量" prop="HStandardQtyForMouldInPack" v-show="isShow">
              <el-form-item label="容器数量/托" prop="HStandardQtyForMouldInPack" v-show="isShow">
                <el-input v-model="form.HStandardQtyForMouldInPack" placeholder="请输入托标准容器数量" />
              </el-form-item>
            </el-col>
@@ -288,24 +288,24 @@
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item label="长" prop="HMouldLength" v-show="isShow">
              <el-form-item label="长(m)" prop="HMouldLength" v-show="isShow">
                <el-input v-model="form.HMouldLength" placeholder="请输入长" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="宽" prop="HMouldWidth" v-show="isShow">
              <el-form-item label="宽(m)" prop="HMouldWidth" v-show="isShow">
                <el-input v-model="form.HMouldWidth" placeholder="请输入宽" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="高" prop="HMouldHeight" v-show="isShow">
              <el-form-item label="高(m)" prop="HMouldHeight" v-show="isShow">
                <el-input v-model="form.HMouldHeight" placeholder="请输入高" />
              </el-form-item>
            </el-col>           
          </el-row>
          <el-row>
             <el-col :span="6">
              <el-form-item label="折叠高度" prop="HMouldFoldHeight" v-show="isShow">
              <el-form-item label="折叠高度(m)" prop="HMouldFoldHeight" v-show="isShow">
                <el-input v-model="form.HMouldFoldHeight" placeholder="请输入折叠高度" />
              </el-form-item>
            </el-col>
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -72,7 +72,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsHide" label="主管" prop="HMangerName">
              <el-form-item v-show="HIsShow" label="主管" prop="HMangerName">
                <el-input v-model="form.HMangerName" placeholder="请选择" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=2)"></el-button>
                </el-input>
@@ -403,15 +403,15 @@
        HBillSubType: [
          { required: true, message: "子单据类型不能为空", trigger: "blur" }
        ],
        HEmpName: [
          { required: true, message: "业务员不能为空", trigger: "blur" }
        ],
        HSecManagerName: [
          { required: true, message: "验收员不能为空", trigger: "blur" }
        ],
        HKeeperName: [
          { required: true, message: "保管员不能为空", trigger: "blur" }
        ]
        // HEmpName: [
        //   { required: true, message: "业务员不能为空", trigger: "blur" }
        // ],
        // HSecManagerName: [
        //   { required: true, message: "验收员不能为空", trigger: "blur" }
        // ],
        // HKeeperName: [
        //   { required: true, message: "保管员不能为空", trigger: "blur" }
        // ]
      }
    };
  },
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -454,15 +454,15 @@
        HStockOutOrgID: [
          { required: true, message: "调出组织不能为空", trigger: "blur" }
        ],
        HEmpName: [
          { required: true, message: "业务员不能为空", trigger: "blur" }
        ],
        HSecManagerName: [
          { required: true, message: "验收员不能为空", trigger: "blur" }
        ],
        HKeeperName: [
          { required: true, message: "保管员不能为空", trigger: "blur" }
        ]
        // HEmpName: [
        //   { required: true, message: "业务员不能为空", trigger: "blur" }
        // ],
        // HSecManagerName: [
        //   { required: true, message: "验收员不能为空", trigger: "blur" }
        // ],
        // HKeeperName: [
        //   { required: true, message: "保管员不能为空", trigger: "blur" }
        // ]
      }
    };
  },
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -504,12 +504,12 @@
        HBillSubType: [
          { required: true, message: "子单据类型不能为空", trigger: "blur" }
        ],
        HSecManagerName: [
          { required: true, message: "验收员不能为空", trigger: "blur" }
        ],
        HKeeperName: [
          { required: true, message: "保管员不能为空", trigger: "blur" }
        ]
        // HSecManagerName: [
        //   { required: true, message: "验收员不能为空", trigger: "blur" }
        // ],
        // HKeeperName: [
        //   { required: true, message: "保管员不能为空", trigger: "blur" }
        // ]
      }
    };
  },
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -543,15 +543,15 @@
        HBillSubType: [
          { required: true, message: "子单据类型不能为空", trigger: "blur" }
        ],
        HSecManagerName: [
          { required: true, message: "验收员不能为空", trigger: "blur" }
        ],
        HEmpName: [
          { required: true, message: "业务员不能为空", trigger: "blur" }
        ],
        HKeeperName: [
          { required: true, message: "保管员不能为空", trigger: "blur" }
        ]
        // HSecManagerName: [
        //   { required: true, message: "验收员不能为空", trigger: "blur" }
        // ],
        // HEmpName: [
        //   { required: true, message: "业务员不能为空", trigger: "blur" }
        // ],
        // HKeeperName: [
        //   { required: true, message: "保管员不能为空", trigger: "blur" }
        // ]
      }
    };
  },
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -512,9 +512,9 @@
        HSecManagerName: [
          { required: true, message: "验收员不能为空", trigger: "blur" }
        ],
        HKeeperName: [
          { required: true, message: "保管员不能为空", trigger: "blur" }
        ]
        // HKeeperName: [
        //   { required: true, message: "保管员不能为空", trigger: "blur" }
        // ]
      }
    };
  },