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

payne

2024-04-24 51f38f6fd09633b20d2af827c5a5b3ec810c5dd3

Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue

@@ -26,9 +26,9 @@
            <a-form-item label="物料类型描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入物料类型描述" v-decorator="['materialTypeDescr']" />
            </a-form-item>
            <!-- <a-form-item label="物料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
            <a-form-item label="物料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input-number placeholder="请输入物料类型" style="width: 100%" v-decorator="['materialType']" />
            </a-form-item> -->
            </a-form-item>


            <a-form-item label="物料类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -161,54 +161,26 @@
      })
    },
    callbacktab(e) {

      const {
        form: { validateFields }
      } = this
      // this.confirmLoading = true

//包装关系
      if (e == 6) {
        this.$nextTick(() => {
          let materialType = this.form.getFieldValue('materialType');
          // 调接口 传物料类型
          const {
            form: { validateFields }
          } = this
          this.confirmLoading = true
          validateFields((errors, values) => {
            if (!errors) {
              for (const key in values) {
                if (typeof values[key] === 'object') {
                  values[key] = JSON.stringify(values[key])
                }
              }
              console.log(values)
              this.confirmLoading = false
              this.$refs.addFormContainerPackagingRef.initShow(values.materialType)

            } else {
              this.confirmLoading = false
            }
          })
          this.$refs.addFormContainerPackagingRef.initShow(materialType)
       
        })
      }
      // 替代品
      if (e == 4) {
        const {
          form: { validateFields }
        } = this
        this.confirmLoading = true
        validateFields((errors, values) => {
          if (!errors) {
            for (const key in values) {
              if (typeof values[key] === 'object') {
                values[key] = JSON.stringify(values[key])
              }
            }
            console.log(66666666666)
            console.log(values)
            this.confirmLoading = false
            debugger
            // materialName  materialCode
            this.$refs.addFormWmsSubstituteGoodRef.initShow(values.materialCode, values.materialName)

          } else {
            this.confirmLoading = false
          }
        })
        let materialCode = this.form.getFieldValue('materialCode');
        let materialName = this.form.getFieldValue('materialName');
        this.$refs.addFormWmsSubstituteGoodRef.initShow(materialCode, materialName)
      }
    },
    handleOk() { },

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsContainerPackaging/addFormContainerPackaging.vue

@@ -202,10 +202,6 @@
      }
    },
    initShow(materialType) {
      if(materialType==''||materialType==null||materialType==undefined){
        this.$message.warning("请选择物料类型")
        return
      }
      this.materialType = materialType
      this.loading = true
      this.getList(() => {