Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

chenhaozhe

8 天以前 723793a0aa8d69cbbb463830a3344dbd6655cee5

 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">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" format="yyyy-MM-dd HH:mm:ss">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -112,6 +112,16 @@
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="内部单据号" prop="HInnerBillNo">
                <el-input v-model="form.HInnerBillNo" placeholder="请输入" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="子单据类型" prop="HBillSubType">
                <el-select v-model="form.HBillSubType" placeholder="请选择子单据类型">
                  <el-option label="发货" value="发货"></el-option>
                  <el-option label="客返" value="客返"></el-option>
                  <el-option label="供应商租借" value="供应商租借"></el-option>
                  <el-option label="供应商返还" value="供应商返还"></el-option>
                </el-select>
              </el-form-item>
            </el-col>
          </el-row>
@@ -404,6 +414,7 @@
      HModName: "Sc_MouldProdBackBillEdit",
      formShow: false,
      temp: undefined,
      HBillSubType: '',
      formLoading: true,
      zzSelDis: false,
      rowHideShow: false,
@@ -489,6 +500,9 @@
        ],
        HStockOrgID: [
          { required: true, message: "组织不能为空", trigger: "blur" }
        ],
        HBillSubType: [
          { required: true, message: "子单据类型不能为空", trigger: "blur" }
        ],
        HSecManagerName: [
          { required: true, message: "验收员不能为空", trigger: "blur" }
@@ -598,6 +612,7 @@
      this.form.HDeptID = data.HDeptID
      this.form.HDeptName = data.HDeptName
      this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
      this.form.HBillSubType = data.HBillSubType
      this.ifOrganizationEdit = true
      console.log(dataArray)
      //子表  赋值
@@ -792,6 +807,7 @@
        HInterID: 0,
        HDate: new Date(),
        HStockOrgID:sessionStorage["OrganizationID"] - 0,
        HBillSubType:'',
        HSupTypeID: 1,
        HSupName:'',
        HSupID:0,
@@ -879,7 +895,7 @@
      //新增获取单据号
      this.getHBillNo()
      let date = new Date()
      this.form.HDate = moment(date).format('YYYY-MM-DD')
      this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
      if (this.OperationType == 1) {
        this.handleAddSysZb()
      }
@@ -994,7 +1010,7 @@
      //新增获取单据号
      this.getHBillNo()
      let date = new Date()
      this.form.HDate = moment(date).format('YYYY-MM-DD')
      this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')

      //设置源单类型
      this.form.HSourceBillType = this.HSouceBillType
@@ -1034,7 +1050,7 @@
          if (this.copyType == 1) {
            this.getHBillNo()
            let date = new Date()
            this.form.HDate = moment(date).format('YYYY-MM-DD')
            this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
          } else {
            if (data[0].HSourceInterID != "0") {
              this.ifOrganizationEdit = true
@@ -1065,6 +1081,7 @@
                , "HChecker": data[0].审核人
                , "HCloseMan": data[0].关闭人
                , "HUpDater": data[0].修改人
                ,"HBillSubType": data[0].子单据类型
                , "HDeleteMan": data[0].作废人
                , "HMakeDate": data[0].制单日期 == null ? "" : data[0].制单日期
                , "HCheckDate": data[0].审核日期 == null ? "" : data[0].审核日期
@@ -1261,10 +1278,12 @@
            }else if(!item.HWHID){
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：调入仓库未选择！");
            }else if(!item.HUnitID){
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：计量单位为空！");
            }else if(item.HQty == 0){
            }
            // else if(!item.HUnitID){
            //   fhck = true
            //   this.$modal.msgError("第" + (index + 1) + "行：计量单位为空！");
            // }
            else if(item.HQty == 0){
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：数量不能为0！");
            }