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

qq_41295110

2025-12-04 05fb7af4f0316fdae54f52076509e582ca5e1e4c

 src/views/scMould/basicModeling/Gy_MouldFile.vue

@@ -285,7 +285,40 @@
              </el-form-item>
            </el-col>
          </el-row>

          <el-row>
            <el-col :span="6">
              <el-form-item label="长" prop="HMouldLength">
                <el-input v-model="form.HMouldLength" placeholder="请输入长" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="宽" prop="HMouldWidth">
                <el-input v-model="form.HMouldWidth" placeholder="请输入宽" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="高" prop="HMouldHeight">
                <el-input v-model="form.HMouldHeight" placeholder="请输入高" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="折叠高度" prop="HMouldFoldHeight">
                <el-input v-model="form.HMouldFoldHeight" placeholder="请输入折叠高度" />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item label="周转容器标记" prop="HTransPackFlag">
                <el-checkbox v-model="form.HTransPackFlag"></el-checkbox>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="发货容器标记" prop="HSendPackFlag">
                <el-checkbox v-model="form.HSendPackFlag"></el-checkbox>
              </el-form-item>
            </el-col>
          </el-row>
        </el-tab-pane>
        <el-tab-pane label="制单信息" name="third">
          <el-row>
@@ -935,8 +968,14 @@
        HNowSPName: '',
        HMouldUseStatus: '',
        HNextMainDate: '',
        HUSEORGID: sessionStorage["OrganizationID"],
        HCREATEORGID: sessionStorage["OrganizationID"],
        HUSEORGID: sessionStorage["OrganizationID"] - 0,
        HCREATEORGID: sessionStorage["OrganizationID"] - 0,
        HMouldLength: '',
        HMouldWidth: '',
        HMouldHeight: '',
        HMouldFoldHeight: '',
        HTransPackFlag: 0,
        HSendPackFlag: 0,
        HMaker: sessionStorage["HUserName"],
        HMakeDate: '',
        HChecker: '',
@@ -1090,6 +1129,12 @@
          this.form.HMouldUseStatus = data.模具可用状态
          this.form.HNextMainDate = data.校正日期
          this.form.HUSEORGID = data.HUSEORGID
          this.form.HMouldLength = data.HMouldLength
          this.form.HMouldWidth = data.HMouldWidth
          this.form.HMouldHeight = data.HMouldHeight
          this.form.HMouldFoldHeight = data.HMouldFoldHeight
          this.form.HTransPackFlag = data.HTransPackFlag == 0 ? false : true
          this.form.HSendPackFlag = data.HSendPackFlag == 0 ? false : true
          for (var i = 0; i < result.data.length; i++) {
            this.editData.push(
              {
@@ -1379,7 +1424,6 @@
    },
    // 编辑提交保存
    submitForm() {
      console.log(1)
      this.$refs["form"].validate(valid => {
        if (valid) {
          let url = null
@@ -1394,6 +1438,8 @@
          } else (
            url = '/Gy_Mould_Edit/AddBill'
          )
          this.form.HTransPackFlag = this.form.HTransPackFlag == false ? 0 : 1
          this.form.HSendPackFlag = this.form.HSendPackFlag == false ? 0 : 1
          var sMainStr = JSON.stringify(this.form);
          var sSubStr = JSON.stringify(this.editData);
          var mainTableMaintainRuleStr = JSON.stringify(this.maintainData);