liuying
2024-04-24 1f6340d13fc98b189c0ebec5e3eab021d643c574
细节
已修改3个文件
已删除3个文件
571 ■■■■■ 文件已修改
iWare_RawMaterialWarehouse_Web/src/views/main/WmsArea/addForm.vue 121 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsArea/editForm.vue 143 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsArea/index.vue 232 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue 67 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsArea/addForm.vue
ÎļþÒÑɾ³ý
iWare_RawMaterialWarehouse_Web/src/views/main/WmsArea/editForm.vue
ÎļþÒÑɾ³ý
iWare_RawMaterialWarehouse_Web/src/views/main/WmsArea/index.vue
ÎļþÒÑɾ³ý
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
@@ -21,10 +21,10 @@
        <a-form-item label="库区描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入库区描述" v-decorator="['areaDesc']" />
        </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="['areaStatus', { rules: [{ required: true, message: '请输入库区状态!' }] }]" />
        </a-form-item>
        </a-form-item> -->
        <a-form-item label="ERP代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入ERP代码"
            v-decorator="['erpCode', { rules: [{ required: true, message: '请输入ERP代码!' }] }]" />
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
@@ -23,9 +23,9 @@
        <a-form-item label="库区描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入库区描述" v-decorator="['areaDesc']" />
        </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="['areaStatus', {rules: [{required: true, message: '请输入库区状态!'}]}]" />
        </a-form-item>
        </a-form-item> -->
        <a-form-item label="ERP代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入ERP代码" v-decorator="['erpCode', {rules: [{required: true, message: '请输入ERP代码!'}]}]" />
        </a-form-item>
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -34,12 +34,6 @@
              </a-select>
            </a-form-item>
            <!-- <a-col :md="8" :sm="24">
              </a-col> -->
            <a-form-item label="物料组" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入物料组" v-decorator="['materialGroup']" />
            </a-form-item>
@@ -47,7 +41,15 @@
              <a-input placeholder="请输入ABC分类名称" v-decorator="['aBCClassName']" />
            </a-form-item> -->
            <a-form-item label="ABC分类" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input-number placeholder="请输入ABC分类" style="width: 100%" v-decorator="['aBCClass']" />
              <!-- <a-input-number placeholder="请输入ABC分类" style="width: 100%" v-decorator="['aBCClass']" /> -->
              <a-select style="width: 100%" placeholder="请选择ABC分类" v-decorator="['factoryCode']">
                <a-select-option v-for="(item, index) in materialTypeData2" :key="index" :value="Number(item.code)">{{
                  item.name }}</a-select-option>
              </a-select>
            </a-form-item>
            <a-form-item label="物料规格" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入物料规格" v-decorator="['materialSpec']" />
@@ -56,10 +58,24 @@
              <a-input placeholder="请输入默认入库库位" v-decorator="['inPlaceCode']" />
            </a-form-item>
            <a-form-item label="库存单位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入库存单位" v-decorator="['materialUnit']" />
              <!-- <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)">{{
                  item.unitName }}</a-select-option>
              </a-select>
            </a-form-item>
            <a-form-item label="采购单位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入采购单位" v-decorator="['pOUnit']" />
              <!-- <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)">{{
                  item.unitName }}</a-select-option>
              </a-select>
            </a-form-item>
            <a-form-item label="颜色" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入颜色" v-decorator="['color']" />
@@ -115,7 +131,7 @@
import addFormContainerPackaging from './tabItem/WmsContainerPackaging/addFormContainerPackaging.vue'
import addFormSub from './tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue'
import addControlRule from './tabItem/WmsControlRule/addForm.vue'
import { WmsUnitPage, WmsUnitDelete, WmsUnitToExcel } from '@/api/modular/main/WmsBase/WmsUnitManage'
export default {
  components: {
    addForm,
@@ -149,12 +165,27 @@
    }
  },
  methods: {
    // ç‰©æ–™ç±»åž‹
    materialTypeDataList() {
      materialTypeDataList().then((d) => {
        this.materialTypeData = d.data || []
      }).catch(() => {
      })
      // åº“存单位
      WmsUnitPage().then((d) => {
        this.selectTypeData1 = d.data.rows || []
      }).catch(() => {
      })
      // é‡‡è´­å•位
      WmsUnitPage().then((d) => {
        this.selectTypeData2 = d.data.rows || []
      }).catch(() => {
      })
    },
    callbacktab(e) {
@@ -177,13 +208,13 @@
    // åˆå§‹åŒ–方法
    add(record) {
      this.visible = true
      this.$nextTick(() => {
        // this.getSelects()
      })
      // const materialTypeOption = this.$options
      // this.materialTypeData = materialTypeOption.filters['dictData']('material_type')
      const inspectionMethodOption = this.$options
      this.inspectionMethodData = inspectionMethodOption.filters['dictData']('material_inspection')
      // this.$nextTick(() => {
      //   // this.getSelects()
      // })
      const materialTypeOption = this.$options
      this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class')
      // const inspectionMethodOption = this.$options
      // this.inspectionMethodData = inspectionMethodOption.filters['dictData']('material_inspection')
    },
    getSelects() {
      if (this.areaNameParameterData.length <= 0 || this.stationNameParameterData.length <= 0) {
@@ -241,7 +272,7 @@
          let BaseCustomerList = [];
          if (this.$refs.addFormBaseCustomer && this.$refs.addFormBaseCustomer.list.length > 0) {
            BaseCustomerList = this.$refs.addFormBaseCustomer.list
          }
          console.log(6666666666666 + '客户档案集合')