MES-WEB-VUEUI.git

parent: 407a6008 | 补丁 | 提交 | ignore whitespace

qq_41295110

17 小时以前 6ef343c78cc2342dc4cace36bbed53a350af0c61

容器管理子表判断仓库选择仓位，仓位弹窗传值筛选

4个文件已修改

	src/views/basic/gyStockPlace/gyStockPlace.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/views/basic/gyStockPlace/gyStockPlace.vue

@@ -459,6 +459,7 @@
  components: { RowSettings, Edit, GyStockPlace, PrintList },
  props: {
    openPage: { type: String },
    openPageData: { type: Object },
  },
  data() {
    return {
@@ -605,8 +606,13 @@
    };
  },
  created() {
    this.handleQuery();
    this.riqiChange();
    if(this.openPageData){
      this.queryParams.HWHName = this.openPageData.HWHName
      this.handleQuery();
    }else{
      this.handleQuery();
    }
  },
  methods: {
    beforeEditCloseHandler() {

 src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue

@@ -352,7 +352,7 @@
      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
      <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :openPageData="openPageData" v-if="gyStockPlaceShow" />
      <scMouldIn @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID="form.HStockOutOrgID" v-if="scMouldInShow" />
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="deptClickSub">确 定</el-button>
@@ -407,6 +407,7 @@
      addBtnShow: false,
      zbIndex: null,
      zbSelForm: {},//子表选中数据
      openPageData:{},//传入弹窗的数据
      dialogTypeNum: null,//部门弹窗1，仓库弹窗2
      deptShow: false,//部门数据组件
      warehouseShow: false,//仓库数据组件
@@ -1283,9 +1284,14 @@
        this.gyMouldShow = true
        this.openData = true
      }  else if (num == 9) {
        this.dialogTitle = '仓位列表'
        this.gyStockPlaceShow = true
        this.openData = true
        if(this.editData[this.zbIndex].HWHName){
          this.dialogTitle = '仓位列表'
          this.openPageData.HWHName = this.editData[this.zbIndex].HWHName
          this.gyStockPlaceShow = true
          this.openData = true
        }else{
          this.$modal.msgError("请先选择仓库!");
        }
      }  else if (num == 3851) {
        this.dialogTitle = '容器入库申请单列表'
        this.scMouldInShow = true

 src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue

@@ -391,7 +391,7 @@
      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
      <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :openPageData="openPageData" v-if="gyStockPlaceShow" />
      <ScMouldMove @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID="form.HStockOutOrgID" v-if="scMouldMoveShow" />
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="deptClickSub">确 定</el-button>
@@ -446,6 +446,7 @@
      addBtnShow: false,
      zbIndex: null,
      zbSelForm: {},//子表选中数据
      openPageData:{},//传入弹窗的数据
      dialogTypeNum: null,//部门弹窗1，仓库弹窗2
      deptShow: false,//部门数据组件
      warehouseShow: false,//仓库数据组件
@@ -1363,9 +1364,26 @@
        this.gyMouldShow = true
        this.openData = true
      }  else if (num == 9) {
        this.dialogTitle = '仓位列表'
        this.gyStockPlaceShow = true
        this.openData = true
        if(this.HSPType==1){
          if(this.editData[this.zbIndex].HWHName){
            this.dialogTitle = '仓位列表'
            this.openPageData.HWHName = this.editData[this.zbIndex].HWHName
            this.gyStockPlaceShow = true
            this.openData = true
          }else{
            this.$modal.msgError("请先选择调入仓库!");
          }
        }
        if(this.HSPType==2){
          if(this.editData[this.zbIndex].HSCWHName){
            this.dialogTitle = '仓位列表'
            this.openPageData.HWHName = this.editData[this.zbIndex].HSCWHName
            this.gyStockPlaceShow = true
            this.openData = true
          }else{
            this.$modal.msgError("请先选择调出仓库!");
          }
        }
      } else if (num == 3850) {
        this.dialogTitle = '容器调拨申请单列表'
        this.scMouldMoveShow = true

 src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue

@@ -352,7 +352,7 @@
      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
      <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :openPageData="openPageData" v-if="gyStockPlaceShow" />
      <ScMouldOut @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID="form.HStockOutOrgID" v-if="scMouldOutShow" />
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="deptClickSub">确 定</el-button>
@@ -407,6 +407,7 @@
      addBtnShow: false,
      zbIndex: null,
      zbSelForm: {},//子表选中数据
      openPageData:{},//传入弹窗的数据
      dialogTypeNum: null,//部门弹窗1，仓库弹窗2
      deptShow: false,//部门数据组件
      warehouseShow: false,//仓库数据组件
@@ -1281,9 +1282,14 @@
        this.gyMouldShow = true
        this.openData = true
      }  else if (num == 9) {
        this.dialogTitle = '仓位列表'
        this.gyStockPlaceShow = true
        this.openData = true
        if(this.editData[this.zbIndex].HWHName){
          this.dialogTitle = '仓位列表'
          this.openPageData.HWHName = this.editData[this.zbIndex].HWHName
          this.gyStockPlaceShow = true
          this.openData = true
        }else{
          this.$modal.msgError("请先选择仓库!");
        }
      } else if (num == 3849) {
        this.dialogTitle = '容器领用出库单列表'
        this.scMouldOutShow = true

			@@ -459,6 +459,7 @@
			components: { RowSettings, Edit, GyStockPlace, PrintList },
			props: {
			openPage: { type: String },
			openPageData: { type: Object },
			},
			data() {
			return {
			@@ -605,8 +606,13 @@
			};
			},
			created() {
			this.handleQuery();
			this.riqiChange();
			if(this.openPageData){
			this.queryParams.HWHName = this.openPageData.HWHName
			this.handleQuery();
			}else{
			this.handleQuery();
			}
			},
			methods: {
			beforeEditCloseHandler() {

			@@ -352,7 +352,7 @@
			<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
			<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
			<GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
			<GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
			<GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :openPageData="openPageData" v-if="gyStockPlaceShow" />
			<scMouldIn @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID="form.HStockOutOrgID" v-if="scMouldInShow" />
			<div slot="footer" class="dialog-footer">
			<el-button type="primary" @click="deptClickSub">确定</el-button>
			@@ -407,6 +407,7 @@
			addBtnShow: false,
			zbIndex: null,
			zbSelForm: {},//子表选中数据
			openPageData:{},//传入弹窗的数据
			dialogTypeNum: null,//部门弹窗1，仓库弹窗2
			deptShow: false,//部门数据组件
			warehouseShow: false,//仓库数据组件
			@@ -1283,9 +1284,14 @@
			this.gyMouldShow = true
			this.openData = true
			} else if (num == 9) {
			this.dialogTitle = '仓位列表'
			this.gyStockPlaceShow = true
			this.openData = true
			if(this.editData[this.zbIndex].HWHName){
			this.dialogTitle = '仓位列表'
			this.openPageData.HWHName = this.editData[this.zbIndex].HWHName
			this.gyStockPlaceShow = true
			this.openData = true
			}else{
			this.$modal.msgError("请先选择仓库!");
			}
			} else if (num == 3851) {
			this.dialogTitle = '容器入库申请单列表'
			this.scMouldInShow = true

			@@ -391,7 +391,7 @@
			<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
			<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
			<GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
			<GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
			<GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :openPageData="openPageData" v-if="gyStockPlaceShow" />
			<ScMouldMove @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID="form.HStockOutOrgID" v-if="scMouldMoveShow" />
			<div slot="footer" class="dialog-footer">
			<el-button type="primary" @click="deptClickSub">确定</el-button>
			@@ -446,6 +446,7 @@
			addBtnShow: false,
			zbIndex: null,
			zbSelForm: {},//子表选中数据
			openPageData:{},//传入弹窗的数据
			dialogTypeNum: null,//部门弹窗1，仓库弹窗2
			deptShow: false,//部门数据组件
			warehouseShow: false,//仓库数据组件
			@@ -1363,9 +1364,26 @@
			this.gyMouldShow = true
			this.openData = true
			} else if (num == 9) {
			this.dialogTitle = '仓位列表'
			this.gyStockPlaceShow = true
			this.openData = true
			if(this.HSPType==1){
			if(this.editData[this.zbIndex].HWHName){
			this.dialogTitle = '仓位列表'
			this.openPageData.HWHName = this.editData[this.zbIndex].HWHName
			this.gyStockPlaceShow = true
			this.openData = true
			}else{
			this.$modal.msgError("请先选择调入仓库!");
			}
			}
			if(this.HSPType==2){
			if(this.editData[this.zbIndex].HSCWHName){
			this.dialogTitle = '仓位列表'
			this.openPageData.HWHName = this.editData[this.zbIndex].HSCWHName
			this.gyStockPlaceShow = true
			this.openData = true
			}else{
			this.$modal.msgError("请先选择调出仓库!");
			}
			}
			} else if (num == 3850) {
			this.dialogTitle = '容器调拨申请单列表'
			this.scMouldMoveShow = true