1

liuying

2024-04-25 cf04c31eb5f3f4c9e2a863010673773e1705385e

1

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

@@ -30,7 +30,7 @@
            <a-form-item label="物料类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-select style="width: 100%" placeholder="请选择物料类型" v-decorator="['materialType']">
                <a-select-option v-for="(item, index) in materialTypeData" :key="index"
                  :value="Number(item.materialTypeCode)">{{ item.materialTypeName }}</a-select-option>
                  :value="item.materialTypeCode">{{ item.materialTypeName }}</a-select-option>
              </a-select>
            </a-form-item>

@@ -43,7 +43,7 @@
            <a-form-item label="ABC分类" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <!-- <a-input-number placeholder="请输入ABC分类" style="width: 100%" v-decorator="['aBCClass']" /> -->

              <a-select style="width: 100%" placeholder="请选择ABC分类" v-decorator="['factoryCode']">
              <a-select style="width: 100%" placeholder="请选择ABC分类" v-decorator="['aBCClass']">
                <a-select-option v-for="(item, index) in materialTypeData2" :key="index" :value="Number(item.code)">{{
                  item.name }}</a-select-option>
              </a-select>
@@ -61,7 +61,7 @@
              <!-- <a-input placeholder="请输入库存单位" v-decorator="['materialUnit']" /> -->

              <a-select style="width: 100%" placeholder="请选择库存单位" v-decorator="['materialUnit']">
                <a-select-option v-for="(item, index) in selectTypeData1" :key="index" :value="Number(item.unitCode)">{{
                <a-select-option v-for="(item, index) in selectTypeData1" :key="index" :value="item.unitCode">{{
                  item.unitName }}</a-select-option>
              </a-select>

@@ -71,7 +71,7 @@
              <!-- <a-input placeholder="请输入采购单位" v-decorator="['pOUnit']" /> -->

              <a-select style="width: 100%" placeholder="请选择采购单位" v-decorator="['pOUnit']">
                <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="Number(item.unitCode)">{{
                <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.unitCode">{{
                  item.unitName }}</a-select-option>
              </a-select>

@@ -208,9 +208,11 @@
      // }
      // 替代品
      if (e == 4) {
        this.$nextTick(() => {
        // let materialCode = this.form.getFieldValue('materialCode');
        // let materialName = this.form.getFieldValue('materialName');
        this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
      })
      }
    },
    handleOk() { },

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

@@ -56,7 +56,8 @@
      },
      visible: false,
      confirmLoading: false,
      form: this.$form.createForm(this)
      form: this.$form.createForm(this),
      selectTypeData:[]
    }
  },
  created() {

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addFormBaseCustomer.vue

@@ -188,14 +188,13 @@
        this.list = selectedRowsArrMy
      }else{
        var arr1 = []
        this.list.forEach(item => {
          var itemArr = selectedRowsArrMy.filter(v=>v.id != item.id)
        selectedRowsArrMy.forEach(item => {
          var itemArr = this.list.filter(v=>v.custCode != item.custCode)
          if(itemArr.length>0){
            //arr1.push(itemArr[0])
            arr1.concat(itemArr)
            arr1 = arr1.concat(itemArr)
          }
        })
        this.list.concat(arr1)
        this.list = [...arr1,...this.list]
      }
      this.visible = false
    },