Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWare...

schangxiang@126.com

2024-04-24 1d5806bb69891d4045438b12c15cd42cc937e5a2

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue

@@ -7,9 +7,11 @@
    @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">

    </a-spin>    <a-form :form="form">
        <a-form-item label="替代编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入替代编号" v-decorator="['substituteCode', {rules: [{required: true, message: '请输入替代编号！'}]}]" />
        <a-input placeholder="请输入替代编号"
          v-decorator="['substituteCode', { rules: [{ required: true, message: '请输入替代编号！' }] }]" />
        </a-form-item>
        <a-form-item label="物料编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料编号" v-decorator="['materialCode', {rules: [{required: true, message: '请输入物料编号！'}]}]" />
@@ -18,19 +20,21 @@
          <a-input placeholder="请输入物料名称" v-decorator="['materialName', {rules: [{required: true, message: '请输入物料名称！'}]}]" />
        </a-form-item>
        <a-form-item label="替代品物料编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入替代品物料编号" v-decorator="['substituteMaterialCode', {rules: [{required: true, message: '请输入替代品物料编号！'}]}]" />
        <a-input placeholder="请输入替代品物料编号"
          v-decorator="['substituteMaterialCode', { rules: [{ required: true, message: '请输入替代品物料编号！' }] }]" />
        </a-form-item>
        <a-form-item label="替代品物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入替代品物料名称" v-decorator="['substituteMaterialName', {rules: [{required: true, message: '请输入替代品物料名称！'}]}]" />
        <a-input placeholder="请输入替代品物料名称"
          v-decorator="['substituteMaterialName', { rules: [{ required: true, message: '请输入替代品物料名称！' }] }]" />
        </a-form-item>
        <a-form-item label="替代次序" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入替代次序" style="width: 100%" v-decorator="['substituteIndex', {rules: [{required: true, message: '请输入替代次序！'}]}]" />
        <a-input-number placeholder="请输入替代次序" style="width: 100%"
          v-decorator="['substituteIndex', { rules: [{ required: true, message: '请输入替代次序！' }] }]" />
        </a-form-item>
        <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
      <!-- <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled',{rules: [{ required: true, message: '请选择是否禁用！' }], valuePropName: 'checked'}]" />
        </a-form-item>
        </a-form-item> -->
      </a-form>
    </a-spin>
  </a-modal>
</template>

@@ -77,18 +81,23 @@
                values[key] = JSON.stringify(values[key])
              }
            }
            WmsSubstituteGoodAdd(values).then((res) => {
              if (res.success) {
                this.$message.success('新增成功')
                this.confirmLoading = false
                this.$emit('ok', values)
                this.handleCancel()
              } else {
                this.$message.error('新增失败：' + JSON.stringify(res.message))
              }
            }).finally((res) => {
              this.confirmLoading = false
            })


          // WmsSubstituteGoodAdd(values).then((res) => {
          //   if (res.success) {
          //     this.$message.success('新增成功')
          //     this.confirmLoading = false
          //     this.$emit('ok', values)
          //     this.handleCancel()
          //   } else {
          //     this.$message.error('新增失败：' + JSON.stringify(res.message))
          //   }
          // }).finally((res) => {
          //   this.confirmLoading = false
          // })
          } else {
            this.confirmLoading = false
          }