物料

liuying

2024-04-24 e4963529b19325117dcbf419c97503b86b16bf22

物料

 iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsControlRuleManage.js

@@ -7,7 +7,7 @@
 */
export function WmsControlRulePage (parameter) {
  return axios({
    url: '/WmsControlRule/page',
    url: '/WmsControlRuleDetail/page',
    method: 'get',
    params: parameter
  })

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRule/index.vue

@@ -7,7 +7,7 @@
          <a-form layout="inline">
            <a-row :gutter="48">
              <a-col :md="8" :sm="24">
                <a-form-item label="规则编号">
                <a-form-item label="规则编号222">
                  <a-input v-model="queryParam.ruleCode" allow-clear placeholder="请输入规则编号" />
                </a-form-item>
              </a-col>

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

@@ -89,21 +89,21 @@
          </a-form>
        </a-tab-pane>
        <a-tab-pane key="2" tab="控制属性" force-render>
          <add-control-rule ref="WmsControlRule" @ok="handleOk" />
          <add-control-rule ref="WmsControlRule" />
        </a-tab-pane>
        <a-tab-pane key="3" tab="批次属性">
          需求待定
        </a-tab-pane>
        <a-tab-pane key="4" tab="替代品管理">
          <add-form-sub ref="addFormWmsSubstituteGoodRef" @ok="handleOk" />
          <add-form-sub ref="addFormWmsSubstituteGoodRef"  />
        </a-tab-pane>
        <a-tab-pane key="5" tab="客户">
          <add-form-base-customer ref="addFormBaseCustomer" @ok="handleOk" />
          <add-form-base-customer ref="addFormBaseCustomer"  />
        </a-tab-pane>

        <a-tab-pane key="6" tab="包装关系">
        <!-- <a-tab-pane key="6" tab="包装关系">
          <add-form-container-packaging ref="addFormContainerPackagingRef" @ok="handleOk" />
        </a-tab-pane>
        </a-tab-pane> -->
      </a-tabs>
    </a-spin>
  </a-modal>
@@ -115,7 +115,7 @@
import addFormBaseCustomer from './tabItem/addFormBaseCustomer/addFormBaseCustomer.vue'
import addFormContainerPackaging from './tabItem/WmsContainerPackaging/addFormContainerPackaging.vue'
import addFormSub from './tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue'
import addControlRule from './tabItem/WmsControlRule/index.vue'
import addControlRule from './tabItem/WmsControlRule/addForm.vue'

export default {
  components: {
@@ -208,44 +208,52 @@
      const {
        form: { validateFields }
      } = this
      this.confirmLoading = true
    
      validateFields((errors, values) => {
        if (!errors) {
          if (this.$getObjectType(values.areas) === 'array') {
            values.areaIds = values.areas.join(',')
            values.areaNameParameterArr = values.areas.map(val => {
              return this.parseSelectName(val, 'areaId', 'areaName', 'areaNameParameterData')
            })
            values.areaNameParameter = values.areaNameParameterArr.join(',')
          }
          if (this.$getObjectType(values.stations) === 'array') {
            values.stationIds = values.stations.join(',')
            values.stationNameParameterArr = values.stations.map(val => {
              return this.parseSelectName(val, 'stationId', 'stationName', 'stationNameParameterData')
            })
            values.stationNameParameter = values.stationNameParameterArr.join(',')
          }
          // if (this.$getObjectType(values.areas) === 'array') {
          //   values.areaIds = values.areas.join(',')
          //   values.areaNameParameterArr = values.areas.map(val => {
          //     return this.parseSelectName(val, 'areaId', 'areaName', 'areaNameParameterData')
          //   })
          //   values.areaNameParameter = values.areaNameParameterArr.join(',')
          // }
          // if (this.$getObjectType(values.stations) === 'array') {
          //   values.stationIds = values.stations.join(',')
          //   values.stationNameParameterArr = values.stations.map(val => {
          //     return this.parseSelectName(val, 'stationId', 'stationName', 'stationNameParameterData')
          //   })
          //   values.stationNameParameter = values.stationNameParameterArr.join(',')
          // }

          console.log(6666666666666 + '控制属性')
          console.log(this.$refs.WmsControlRule.selectedRows)
          var ControlRuleld = this.$refs.WmsControlRule.selectedRows[0].id
         
          var ControlRuleld = this.$refs.WmsControlRule.form.getFieldValue('id') || ''

          let SubstituteGoodList = []
          if(this.$refs.addFormWmsSubstituteGoodRef && this.$refs.addFormWmsSubstituteGoodRef.list.length>0){
            SubstituteGoodList = this.$refs.addFormWmsSubstituteGoodRef.list
          }
          console.log(6666666666666 + '替代品')
          console.log(this.$refs.addFormWmsSubstituteGoodRef.list)


          let BaseCustomerList = [];
          if(this.$refs.addFormBaseCustomer && this.$refs.addFormBaseCustomer.list.length>0){
            BaseCustomerList = this.$refs.addFormWmsSubstituteGoodRef.list
          }
          console.log(6666666666666 + '客户档案集合')
          console.log(this.$refs.addFormBaseCustomer.list)

          // console.log(6666666666666 + '包装关系')
          // console.log(this.$refs.addFormContainerPackagingRef.list)

          console.log(6666666666666 + '包装关系')
          console.log(this.$refs.addFormContainerPackagingRef.list)
          var param = {
            MaterialInput: values,
            ControlRuleld: ControlRuleld, //控制属性
            SubstituteGoodList: this.$refs.addFormWmsSubstituteGoodRef.list, //替代品
            BaseCustomerList: this.$refs.addFormBaseCustomer.list, //客户档案集合
            ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //包装关系
            SubstituteGoodList: SubstituteGoodList, //替代品
            BaseCustomerList: BaseCustomerList, //客户档案集合
            // ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //包装关系
          }
          this.confirmLoading = true
          WmsMaterialAdd(param)
            .then(res => {
              if (res.success) {

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

@@ -1,94 +1,111 @@
<template>
  <a-modal
    title="新增控制属性规则"
    :width="900"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
        <a-form :form="form">
        <a-form-item label="规则编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入规则编号" v-decorator="['ruleCode', {rules: [{required: true, message: '请输入规则编号！'}]}]" />
  <div>
    <a-form :form="form">
        <a-form-item label="控制属性规则明细" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input disabled  placeholder="请输入控制属性规则编号" v-decorator="['ruleCode', {rules: [{required: true, message: '请输入控制属性规则编号！'}]}]" />
        </a-form-item>
        <a-form-item label="规则名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入规则名称" v-decorator="['ruleName', {rules: [{required: true, message: '请输入规则名称！'}]}]" />
        <a-form-item label="最高库存" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input disabled placeholder="请输入最高库存" v-decorator="['maxImumqty']" />
        </a-form-item>
        <a-form-item label="规则描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入规则描述" v-decorator="['ruleDesc']" />
        <a-form-item label="最低库存" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input disabled placeholder="请输入最低库存" v-decorator="['minImumqty']" />
        </a-form-item>
        <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled',{rules: [{ required: true, message: '请选择是否禁用！' }], valuePropName: 'checked'}]" />
        <a-form-item label="安全库存" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input disabled placeholder="请输入安全库存" v-decorator="['safeImumqty']" />
        </a-form-item>
        <a-form-item label="最小库龄" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input disabled placeholder="请输入最小库龄" v-decorator="['minStorageAge']" />
        </a-form-item>
        <a-form-item label="最大库龄" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input disabled placeholder="请输入最大库龄" v-decorator="['maxStorageAge']" />
        </a-form-item>
        <a-form-item label="是否免检" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isNotChek', { valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item label="保质期天数" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input disabled placeholder="请输入保质期天数" v-decorator="['shelfLifeDays']" />
        </a-form-item>
        <!-- <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
        </a-form-item> -->
      <a-form-item style="visibility:hidden" v-show="false"><a-input v-decorator="['id']" /></a-form-item>
      </a-form>
    </a-spin>
  </a-modal>

    <p @click="visible = true">新增行</p>
    <a-modal title="新增物料-控制属性" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
      @cancel="handleCancel">
      <show-list ref="showList" @ok="handleOk" />
      <!-- <a-spin :spinning="confirmLoading"></a-spin> -->
    </a-modal>
  </div>
</template>

<script>
  import moment from 'moment'
  import {
import moment from 'moment'
import {
  WmsControlRuleAdd
  } from '@/api/modular/main/WmsBase/WmsControlRuleManage'
  export default {
  data () {
  return {
  labelCol: {
  xs: { span: 24 },
  sm: { span: 5 }
  },
  wrapperCol: {
  xs: { span: 24 },
  sm: { span: 15 }
  },
        visible: false,
        confirmLoading: false,
        form: this.$form.createForm(this)
      }
    },
    methods: {
    moment,
      // 初始化方法
      add (record) {
        this.visible = true
        this.$nextTick(() => {
} from '@/api/modular/main/WmsBase/WmsControlRuleManage'
import showList from './index.vue'

        });
export default {
  components: {
    showList
  },
  data() {
    return {
      labelCol: {
        xs: { span: 24 },
        sm: { span: 5 }
      },
      /**
       * 提交表单
       */
      handleSubmit () {
        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])
              }
            }
            WmsControlRuleAdd(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
          }
        })
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 15 }
      },
      handleCancel () {
        this.form.resetFields()
        this.visible = false
      }
      visible: false,
      confirmLoading: false,
      form: this.$form.createForm(this)
    }
  },
  methods: {
    moment,
    // 初始化方法
    add(record) {
      this.visible = true
      this.$nextTick(() => {

      });
    },
    /**
     * 提交表单
     */
    handleSubmit() {

      // if(){

      // }
      this.visible = false
      let record1 = this.$refs.showList.selectedRows[0];
      let record =record1;
      console.log("5555555")
debugger
      this.form.setFieldsValue({
            id: record.id,
            ruleCode: record.ruleCode,
              maxImumqty: record.maxImumqty,
              minImumqty: record.minImumqty,
              safeImumqty: record.safeImumqty,
              minStorageAge: record.minStorageAge,
              maxStorageAge: record.maxStorageAge,
              isNotChek: record.isNotChek,
              shelfLifeDays: record.shelfLifeDays,
              isDisabled: record.isDisabled
          })

    },
    handleCancel() {
      this.form.resetFields()
      this.visible = false
    }
  }
}
</script>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue

@@ -14,8 +14,7 @@
              <a-col :md="8" :sm="24">
                <a-form-item label="规则名称">
                  <a-input v-model="queryParam.ruleName" allow-clear placeholder="请输入规则名称" />
                </a-form-item> </a-col
              ><template v-if="advanced">
                </a-form-item> </a-col><template v-if="advanced">
                <a-col :md="8" :sm="24">
                  <a-form-item label="规则描述">
                    <a-input v-model="queryParam.ruleDesc" allow-clear placeholder="请输入规则描述" />
@@ -23,12 +22,8 @@
                </a-col>
                <a-col :md="8" :sm="24">
                  <a-form-item label="是否禁用">
                    <a-select
                      :allowClear="true"
                      style="width: 100%"
                      v-model="queryParam.isDisabled"
                      placeholder="请选择是否禁用"
                    >
                    <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled"
                      placeholder="请选择是否禁用">
                      <a-select-option v-for="(item, index) in isDisabledData" :key="index" :value="item.code">{{
                        item.name
                      }}</a-select-option>
@@ -40,18 +35,11 @@

                <a-col :md="8" :sm="24">
                  <a-form-item label="创建时间">
                    <a-range-picker
                      style="width: 100%"
                      :placeholder="['开始时间', '结束时间']"
                      :show-time="{
                        format: 'HH:mm:ss',
                        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
                      }"
                      v-model="queryParam.createdTime"
                      value-format="YYYY-MM-DD HH:mm:ss"
                      format="YYYY-MM-DD HH:mm:ss"
                      @change="onChangecreatedTime"
                    />
                    <a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']" :show-time="{
                      format: 'HH:mm:ss',
                      defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
                    }" v-model="queryParam.createdTime" value-format="YYYY-MM-DD HH:mm:ss"
                      format="YYYY-MM-DD HH:mm:ss" @change="onChangecreatedTime" />
                  </a-form-item>
                </a-col>
                <!--年月日时分秒-->
@@ -59,18 +47,11 @@

                <a-col :md="8" :sm="24">
                  <a-form-item label="更新时间">
                    <a-range-picker
                      style="width: 100%"
                      :placeholder="['开始时间', '结束时间']"
                      :show-time="{
                        format: 'HH:mm:ss',
                        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
                      }"
                      v-model="queryParam.updatedTime"
                      value-format="YYYY-MM-DD HH:mm:ss"
                      format="YYYY-MM-DD HH:mm:ss"
                      @change="onChangeupdatedTime"
                    />
                    <a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']" :show-time="{
                      format: 'HH:mm:ss',
                      defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
                    }" v-model="queryParam.updatedTime" value-format="YYYY-MM-DD HH:mm:ss"
                      format="YYYY-MM-DD HH:mm:ss" @change="onChangeupdatedTime" />
                  </a-form-item>
                </a-col>

@@ -102,16 +83,9 @@
      </a-card>
    </div>
    <a-card :bordered="false">
      <s-table
        ref="table"
        :columns="columns"
        :data="loadData"
        :alert="true"
        @changeTablePage="pageInfo = $event"
        :scroll="{ x: true, y: tableHeight }"
        :rowKey="record => record.id"
        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
      >
      <s-table ref="table" :columns="columns" :data="loadData" :alert="true" @changeTablePage="pageInfo = $event"
        :scroll="{ x: true, y: tableHeight }" :rowKey="record => record.id"
        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
        <template class="table-operator" slot="operator" v-if="hasPerm('WmsControlRule:add')">
          <!-- <div ref="actionBar" class="actionBar">
            <a-button
@@ -144,20 +118,19 @@
          </div>
          <div v-else=""></div>
        </span>
        <span slot="action" slot-scope="text, record">
          <!-- 自定义 -->
        <!-- <span slot="action" slot-scope="text, record">
          <a v-if="hasPerm('WmsControlRule:getdetail')" @click="$refs.detailForm.edit(record)">详情</a>
          &nbsp;&nbsp;
          </a-popconfirm>
        </span>
        </span> -->
      </s-table>
      <add-form ref="addForm" @ok="handleOk" />
      <edit-form ref="editForm" @ok="handleOk" />
      <excel-form ref="excelForm" @ok="handleOk" />
	  
      <!-- 自定义 -->

      <!-- 自定义 -->
      <detail-form ref="detailForm" @ok="handleOk" />
	  

    </a-card>
  </div>
</template>
@@ -204,19 +177,19 @@
          customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
        },
        {
          title: '规则编号',
          title: '控制属性规则编号',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '150px'//最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
@@ -224,44 +197,145 @@
          dataIndex: 'ruleCode'
        },
        {
          title: '规则名称',
          title: '最高库存',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'ruleName'
          dataIndex: 'maxImumqty'
        },
        {
          title: '规则描述',
          title: '最低库存',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'ruleDesc'
          dataIndex: 'minImumqty'
        },
        {
          title: '安全库存',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'safeImumqty'
        },
        {
          title: '最小库龄',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'minStorageAge'
        },
        {
          title: '最大库龄',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'maxStorageAge'
        },
        {
          title: '是否免检',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'isNotChek',
          scopedSlots: { customRender: 'isNotChekscopedSlots' }
        },
        {
          title: '保质期天数',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'shelfLifeDays'
        },
        {
          title: '是否禁用',
@@ -269,14 +343,14 @@
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
@@ -290,14 +364,14 @@
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
@@ -310,14 +384,14 @@
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
@@ -330,14 +404,14 @@
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
@@ -350,14 +424,14 @@
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
                'min-width': '120px'//最小列宽设置
              }
            }
          },
@@ -377,14 +451,14 @@
    }
  },
  created() {
    if (this.hasPerm('WmsControlRule:edit') || this.hasPerm('WmsControlRule:delete')) {
      this.columns.push({
        title: '操作',
        width: '150px',
        dataIndex: 'action',
        scopedSlots: { customRender: 'action' }
      })
    }
    // if (this.hasPerm('WmsControlRule:edit') || this.hasPerm('WmsControlRule:delete')) {
    //   this.columns.push({
    //     title: '操作',
    //     width: '150px',
    //     dataIndex: 'action',
    //     scopedSlots: { customRender: 'action' }
    //   })
    // }
    const path = this.$route.path
    const columnStr = window.localStorage.getItem(path)
    if (columnStr) {
@@ -506,6 +580,7 @@
.table-operator {
  margin-bottom: 18px;
}

button {
  margin-right: 8px;
}

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

@@ -4,10 +4,10 @@
    <a-spin :spinning="confirmLoading">

    </a-spin> <a-form :form="form">
      <a-form-item label="替代编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
      <!-- <a-form-item label="替代编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
        <a-input placeholder="请输入替代编号"
          v-decorator="['substituteCode', { rules: [{ required: true, message: '请输入替代编号！' }] }]" />
      </a-form-item>
      </a-form-item> -->
      <!-- <a-form-item label="物料编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
        <a-input placeholder="请输入物料编号"
          v-decorator="['materialCode', { rules: [{ required: true, message: '请输入物料编号！' }] }]" />
@@ -17,13 +17,18 @@
          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-select style="width: 100%" placeholder="请选择替代品物料编号" v-decorator="['substituteMaterialCode']">
          <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.materialCode">{{
            item.materialName }}</a-select-option>
        </a-select>

      </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 placeholder="请输入替代品物料名称"
          v-decorator="['substituteMaterialName', { rules: [{ required: true, message: '请输入替代品物料名称！' }] }]" />
      </a-form-item>
      </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: '请输入替代次序！' }] }]" />
@@ -40,6 +45,8 @@
import {
  WmsSubstituteGoodAdd
} from '@/api/modular/main/WmsBase/WmsSubstituteGoodManage'

import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
export default {
  data() {
    return {
@@ -55,6 +62,9 @@
      confirmLoading: false,
      form: this.$form.createForm(this)
    }
  },
  created() {
    this.getSelectDataList()
  },
  methods: {
    moment,
@@ -76,8 +86,12 @@
          }
        )
      })


    },
    getSelectDataList() {
      WmsMaterialPage().then((d) => {
        this.selectTypeData = d.data.rows || []
      }).catch(() => {
      })
    },
    /**
     * 提交表单

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

@@ -72,26 +72,26 @@
          scopedSlots: { customRender: 'index' },
          align: 'center'
        },
        {
                    title: '替代编号',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'substituteCode'
                },
        // {
                //     title: '替代编号',
                //     align: 'center',
                //     customHeaderCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '120px'//最小列宽设置
                //             }
                //         }
                //     },
                //     customCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '120px'//最小列宽设置
                //             }
                //         }
                //     },
                //     sorter: true,
                //     dataIndex: 'substituteCode'
                // },
                // {
                //     title: '物料编号',
                //     align: 'center',
@@ -152,26 +152,26 @@
                    sorter: true,
                    dataIndex: 'substituteMaterialCode'
                },
                {
                    title: '替代品物料名称',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '140px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '140px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'substituteMaterialName'
                },
                // {
                //     title: '替代品物料名称',
                //     align: 'center',
                //     customHeaderCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '140px'//最小列宽设置
                //             }
                //         }
                //     },
                //     customCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '140px'//最小列宽设置
                //             }
                //         }
                //     },
                //     sorter: true,
                //     dataIndex: 'substituteMaterialName'
                // },
                {
                    title: '替代次序',
                    align: 'center',

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue

@@ -511,7 +511,7 @@
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
    'min-width': '140px'//最小列宽设置
     }
     }
    },