llj
2 天以前 948a79282b0402364ea0078f536b2f1a07fbb400
容器管理下的仓储管理问题修复
9个文件已修改
173 ■■■■ 已修改文件
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -19,7 +19,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="日期" prop="HDate">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" format="yyyy-MM-dd HH:mm:ss">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" format="yyyy-MM-dd">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -34,7 +34,7 @@
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="往来类型" prop="HSupTypeID">
              <el-form-item v-show="false" label="往来类型" prop="HSupTypeID">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型" @change="form.HSupName='',form.HSupId=0">
                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
                  </el-option>
@@ -42,7 +42,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="往来单位" prop="HSupName">
              <el-form-item v-show="false" label="往来单位" prop="HSupName">
                <el-input v-model="form.HSupName" placeholder="请选择往来单位" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
                </el-input>
@@ -1017,6 +1017,9 @@
    
    // 编辑提交保存
    submitForm() {
        if (this.form.HDate) {
      this.form.HDate = moment(this.form.HDate).format('YYYY-MM-DD');
    }
      this.$refs["form"].validate(valid => {
        if (valid) {
          let fhck = false
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -19,7 +19,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="日期" prop="HDate">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" format="yyyy-MM-dd HH:mm:ss">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" format="yyyy-MM-dd">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -42,7 +42,7 @@
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="往来类型" prop="HSupTypeID">
              <el-form-item v-show="false" label="往来类型" prop="HSupTypeID">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型" @change="form.HSupName='',form.HSupId=0">
                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
                  </el-option>
@@ -50,7 +50,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="往来单位" prop="HSupName">
              <el-form-item v-show="false" label="往来单位" prop="HSupName">
                <el-input v-model="form.HSupName" placeholder="请选择往来单位" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
                </el-input>
@@ -890,6 +890,7 @@
                , "HDeleteMan": data.作废人
                , "HDeleteDate": data.作废日期 == null ? "" : data.作废日期
            }
            console.log("ci form",this.form)
            this.form.HStockInOrgID = data.HStockInOrgID == null ? 0 : data.HStockInOrgID;
            this.form.HStockOutOrgID = data.HStockOutOrgID == null ? 0 : data.HStockOutOrgID;
            //子表
@@ -1116,6 +1117,9 @@
    
    // 编辑提交保存
    submitForm() {
       if (this.form.HDate) {
      this.form.HDate = moment(this.form.HDate).format('YYYY-MM-DD');
    }
      this.$refs["form"].validate(valid => {
        if (valid) {
          let fhck = false
@@ -1146,6 +1150,7 @@
              var sMainStr = JSON.stringify(this.form);
              var sSubStr = JSON.stringify(this.editData);
              var sMainSub = sMainStr + ';' + sSubStr + ';' + Operation + ";" + sessionStorage["HUserName"];
              console.log(sMainStr)
              axios({
                method: 'post',
                url: this.$baseUrl + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Save_Json",
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -19,7 +19,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="日期" prop="HDate">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" format="yyyy-MM-dd HH:mm:ss">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" format="yyyy-MM-dd">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -34,7 +34,7 @@
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="往来类型" prop="HSupTypeID">
              <el-form-item v-show="false" label="往来类型" prop="HSupTypeID">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型" @change="form.HSupName='',form.HSupId=0">
                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
                  </el-option>
@@ -42,7 +42,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="往来单位" prop="HSupName">
              <el-form-item v-show="false" label="往来单位" prop="HSupName">
                <el-input v-model="form.HSupName" placeholder="请选择往来单位" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
                </el-input>
@@ -212,7 +212,7 @@
              size="mini">上移</el-button>
            <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
              size="mini">下移</el-button>
            <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">容器库存</el-button>
            <!-- <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">容器库存</el-button> -->
            
            <el-button type="success" plain icon="el-icon-printer" @click="get_ContainerInstantStock(zbSelForm)">容器即时库存</el-button>
          </div>
@@ -975,6 +975,7 @@
                , "HDeleteMan": data.作废人
                , "HDeleteDate": data.作废日期 == null ? "" : data.作废日期
            }
            console.log('form的内容',this.form)
            this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID;
            //子表
@@ -1166,6 +1167,9 @@
    
    // 编辑提交保存
    submitForm() {
        if (this.form.HDate) {
      this.form.HDate = moment(this.form.HDate).format('YYYY-MM-DD');
    }
      this.$refs["form"].validate(valid => {
        if (valid) {
          let fhck = false
@@ -1196,6 +1200,7 @@
              var sMainStr = JSON.stringify(this.form);
              var sSubStr = JSON.stringify(this.editData);
              var sMainSub = sMainStr + ';' + sSubStr + ';' + Operation + ";" + sessionStorage["HUserName"];
              console.log(sMainStr)
              axios({
                method: 'post',
                url: this.$baseUrl + "/Sc_MouldOutRequestBillController/GetSc_MouldOutRequestBill_Save_Json",
src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -155,14 +155,14 @@
        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
          @click="set_CheckBill(2, form = rowForm)">反审核</el-button>
      </el-col>
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
          @click="set_CheckBillAll(1, ids)">审核(批量)</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
          @click="set_CheckBillAll(2, ids)">反审核(批量)</el-button>
      </el-col>
      </el-col> -->
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
      </el-col> -->
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -19,7 +19,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="日期" prop="HDate">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" format="yyyy-MM-dd HH:mm:ss">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" format="yyyy-MM-dd">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -34,7 +34,7 @@
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="往来类型" prop="HSupTypeID">
              <el-form-item v-show="false" label="往来类型" prop="HSupTypeID">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型" @change="form.HSupName='',form.HSupId=0">
                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
                  </el-option>
@@ -42,7 +42,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="往来单位" prop="HSupName">
              <el-form-item v-show="false" label="往来单位" prop="HSupName">
                <el-input v-model="form.HSupName" placeholder="请选择往来单位" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
                </el-input>
@@ -95,7 +95,7 @@
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="源单类型" prop="HSourceBillType">
              <el-form-item v-show="false" label="源单类型" prop="HSourceBillType">
                <el-select v-model="form.HSourceBillType" placeholder="请选择">
                  <el-option v-for="(item, index) in HSourceBillTypes" :key="index" :label="item.HSourceBillTypeName" :value="item.HSourceBillType">
                  </el-option>
@@ -103,7 +103,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="源单单号" prop="HSourceBillNo">
              <el-form-item v-show="false" label="源单单号" prop="HSourceBillNo">
                <el-input placeholder="请选择源单单号" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="get_checkMainSource()"></el-button>
                </el-input>
@@ -216,7 +216,7 @@
              size="mini">上移</el-button>
            <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
              size="mini">下移</el-button>
            <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">容器库存</el-button>
            <!-- <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">容器库存</el-button> -->
             <el-button type="success" plain icon="el-icon-printer" @click="get_ContainerInstantStock(zbSelForm)">容器即时库存</el-button>
          </div>
          <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@@ -614,6 +614,9 @@
      this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
      this.form.HBillSubType = data.HBillSubType
      this.ifOrganizationEdit = true
      this.form.HWHID= data.HWHID
      this.form.HWHNumber= data.HWHNumber
      this.form.HWHName= data.HWHName
      console.log(dataArray)
      //子表  赋值
      var rowdata = [];
@@ -728,6 +731,11 @@
              this.form.HWHName = deptRow.仓库名称
              this.form.HWHID = deptRow.HItemID
              this.form.HWHNumber = deptRow.仓库代码
              for(i=0;i<this.editData.length;i++){
                this.editData[i].HWHID = deptRow.HItemID
                this.editData[i].HWHNumber = deptRow.仓库代码
                this.editData[i].HWHName = deptRow.仓库名称
              }
            }else{
              this.editData[this.zbIndex].HWHID = deptRow.HItemID
              this.editData[this.zbIndex].HWHNumber = deptRow.仓库代码
@@ -1264,6 +1272,9 @@
    
    // 编辑提交保存
    submitForm() {
        if (this.form.HDate) {
      this.form.HDate = moment(this.form.HDate).format('YYYY-MM-DD');
    }
      this.$refs["form"].validate(valid => {
        if (valid) {
          let fhck = false
src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -135,6 +135,7 @@
        <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">托数变更
        </el-button>
      </el-col>
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">复制</el-button>
@@ -805,7 +806,7 @@
      }).then(({ value }) => {
        const newPallet = parseInt(value)
        
        return axios.post(this.$baseUrl + '/Sc_MouldProdBackBillController/UpdatePallet', {
        return axios.post(this.$baseUrl + '/Sc_MouldProdMoveBillController/UpdatePallet', {
          hmainid: rowData.hmainid,
          newPallet: newPallet,
          operator: sessionStorage["HUserName"]
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -19,7 +19,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="日期" prop="HDate">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" format="yyyy-MM-dd HH:mm:ss">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" format="yyyy-MM-dd">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -34,7 +34,7 @@
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="往来类型" prop="HSupTypeID">
              <el-form-item v-show="false" label="往来类型" prop="HSupTypeID">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型" @change="form.HSupName='',form.HSupId=0">
                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
                  </el-option>
@@ -42,7 +42,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="往来单位" prop="HSupName">
              <el-form-item v-show="false" label="往来单位" prop="HSupName">
                <el-input v-model="form.HSupName" placeholder="请选择往来单位" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
                </el-input>
@@ -94,13 +94,13 @@
                </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="6">
            <!-- <el-col :span="6">
              <el-form-item v-show="HIsShow" label="负责人" prop="HMangerName">
                <el-input v-model="form.HMangerName" placeholder="请选择" disabled>
                <el-input v-model="form.HManagerName" placeholder="请选择" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=2)"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
            </el-col> -->
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="验收员" prop="HSecManagerName">
                <el-input v-model="form.HSecManagerName" placeholder="请选择" disabled>
@@ -559,6 +559,7 @@
    this.fetchData()
    this.SourceBillType()
    this.getdata()
  },
  methods: {
    fetchData() {
@@ -867,10 +868,21 @@
              this.form.HWHName = deptRow.仓库名称
              this.form.HWHID = deptRow.HItemID
              this.form.HWHNumber = deptRow.仓库代码
              for(i=0;i<this.editData.length;i++){
                this.editData[i].HWHID = deptRow.HItemID
                this.editData[i].HWHNumber = deptRow.仓库代码
                this.editData[i].HWHName = deptRow.仓库名称
              }
            }else if(this.eHWHType == 2){
              this.form.HSCWHName = deptRow.仓库名称
              this.form.HSCWHID = deptRow.HItemID
              this.form.HSCWHNumber = deptRow.仓库代码
               for(i=0;i<this.editData.length;i++){
                this.editData[i].HSCWHID = deptRow.HItemID
                this.editData[i].HSCWHNumber = deptRow.仓库代码
                this.editData[i].HSCWHName = deptRow.仓库名称
              }
            }else if(this.eHWHType == 3){
              this.editData[this.zbIndex].HWHID = deptRow.HItemID
              this.editData[this.zbIndex].HWHNumber = deptRow.仓库代码
@@ -924,13 +936,15 @@
            this.openData = false
          } else if (num == 9){
            if(this.HSPType == 1){
              this.editData[this.zbIndex].HSPID = deptRow.HMainID
              this.editData[this.zbIndex].HSPID = deptRow.HItemID || 0
              this.editData[this.zbIndex].HSPNumber = deptRow.仓位代码
              this.editData[this.zbIndex].HSPName = deptRow.仓位名称
              console.log( "仓位id",deptRow.HItemID)
            }else{
              this.editData[this.zbIndex].HSCSPID = deptRow.HMainID
              this.editData[this.zbIndex].HSCSPID = deptRow.HItemID || 0
              this.editData[this.zbIndex].HSCSPNumber = deptRow.仓位代码
              this.editData[this.zbIndex].HSCSPName = deptRow.仓位名称
              console.log( "仓位2id",deptRow.HItemID)
            }
            this.gyStockPlaceShow = false
            this.openData = false
@@ -976,8 +990,8 @@
        HSCWHID:0,
        HEmpName:'',
        HEmpID:0,
        HMangerName:'',
        HMangerID:0,
        HManagerName:'',
        HManagerID:0,
        HSecManagerName:'',
        HSecManagerID:0,
        HKeeperName:'',
@@ -1166,6 +1180,7 @@
            this.form.HStockInOrgID = data[0].HStockInOrgID == null ? 0 : data[0].HStockInOrgID;
            this.form.HStockOutOrgID = data[0].HStockOutOrgID == null ? 0 : data[0].HStockOutOrgID;
            //子表  赋值
            console.log(response.data.data)
            this.editData = response.data.data[0];
            this.editData1 = response.data.data[1];
          }
@@ -1336,9 +1351,12 @@
      }
    },
    //#endregion
    // 编辑提交保存
    submitForm() {
        if (this.form.HDate) {
      this.form.HDate = moment(this.form.HDate).format('YYYY-MM-DD');
    }
      this.$refs["form"].validate(valid => {
        if (valid) {
          let fhck = false
@@ -1380,6 +1398,7 @@
              var sMainStr = JSON.stringify(this.form);
              var sSubStr = JSON.stringify(this.editData);
              var sMainSub = sMainStr + ';' + sSubStr + ';' + Operation + ";" + sessionStorage["HUserName"];
              console.log(sSubStr)
              axios({
                method: 'post',
                url: this.$baseUrl + "/Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Save_Json",
src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
@@ -135,6 +135,10 @@
        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">复制</el-button>
      </el-col> -->
       <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">托数变更
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">删除
        </el-button>
@@ -585,6 +589,51 @@
        return { "background": "#ecf5ff" }
      }
    },
       //托数变更
    set_PalletChange() {
      if (!this.rowForm || !this.rowForm.hmainid) {
        this.$modal.msgError('请先选择一条记录!')
        return
      }
      const rowData = this.rowForm // 使用 rowForm 而不是 rowList
      const currentPallet = rowData.托数 || 0
      // 将"请输入新托数"作为输入框的placeholder
      this.$prompt(`当前托数:${currentPallet}`, {
        confirmButtonText: '保存',
        cancelButtonText: '取消',
        inputValue: currentPallet,
        inputType: 'number',
        inputValidator: (value) => {
          if (!value) return '请输入托数!'
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字!'
          if (num.toString() !== value) return '托数不能为小数!'
          if (num <0) return '托数必须大于0!'
          return true
        }
      }).then(({ value }) => {
        const newPallet = parseInt(value)
        return axios.post(this.$baseUrl + '/Sc_MouldProdBackBillController/UpdatePallet', {
          hmainid: rowData.hmainid,
          newPallet: newPallet,
          operator: sessionStorage["HUserName"]
        })
      }).then(response => {
        if (response.data && response.data.count == 1) {
          this.$modal.msgSuccess('托数变更成功!')
          this.getList()
        } else {
          this.$modal.msgError('错误:' + (response.data.Message || '保存失败'))
        }
      }).catch(error => {
        if (error !== 'cancel') {
          this.$modal.msgError('操作失败:' + error.message)
        }
      })
    },
    //双击行
    handleDblclick(row, column, cell, event) {
      this.OperationType = 2
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -19,7 +19,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="日期" prop="HDate">
                <el-date-picker v-model="form.HDate" type="datetime" placeholder="选择日期时间" value-format="yyyy-MM-dd HH:mm:ss">
                <el-date-picker v-model="form.HDate" type="datetime" placeholder="选择日期时间" value-format="yyyy-MM-dd">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -34,7 +34,7 @@
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="往来类型" prop="HSupTypeID">
              <el-form-item v-show="false" label="往来类型" prop="HSupTypeID">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型" @change="form.HSupName='',form.HSupId=0">
                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
                  </el-option>
@@ -42,7 +42,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="往来单位" prop="HSupName">
              <el-form-item v-show="false" label="往来单位" prop="HSupName">
                <el-input v-model="form.HSupName" placeholder="请选择往来单位" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
                </el-input>
@@ -619,6 +619,8 @@
      this.form.HBillSubType = data.HBillSubType
      this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
      this.ifOrganizationEdit = true
      this.form.HWHName = data.HWHName
      this.form.HWHID = data.HWHID
      //子表  赋值
      var rowdata = [];
      for (let i = 0; i < dataArray.length; i++) {
@@ -732,6 +734,13 @@
              this.form.HWHName = deptRow.仓库名称
              this.form.HWHID = deptRow.HItemID
              this.form.HWHNumber = deptRow.仓库代码
              for(i=0;i<this.editData.length;i++){
                this.editData[i].HWHID = deptRow.HItemID
                this.editData[i].HWHNumber = deptRow.仓库代码
                this.editData[i].HWHName = deptRow.仓库名称
                console.log(this.editData[i].HWHID)
              }
            }else{
              this.editData[this.zbIndex].HWHID = deptRow.HItemID
              this.editData[this.zbIndex].HWHNumber = deptRow.仓库代码
@@ -1007,9 +1016,11 @@
                , "HUpDateDate": data[0].修改日期 == null ? "" : data[0].修改日期
                , "HDeleteDate": data[0].作废日期 == null ? "" : data[0].作废日期
            }
            this.form.HStockOrgID = data[0].HMainStockOrgID == null ? 0 : data[0].HMainStockOrgID;
            //子表  赋值
            this.editData = response.data.data[0];
            console.log(this.editData)
            this.editData1 = response.data.data[1];
          }
          this.formShow = true
@@ -1265,6 +1276,9 @@
  },
  //#endregion
    submitForm() {
        if (this.form.HDate) {
      this.form.HDate = moment(this.form.HDate).format('YYYY-MM-DD');
    }
      this.$refs["form"].validate(valid => {
        if (valid) {
          let fhck = false