1

liuying

2024-04-25 7867fe8c467bea3ad03e979f0215d175b5b1b94e

1

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

@@ -1,9 +1,10 @@
<template>
  <a-modal :title="title" :width="1300" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
    @cancel="handleCancel" :footer="null">

    <a-spin :spinning="confirmLoading">
      <!-- tab -->
      <a-tabs default-active-key="1" @change="callbacktab">
      <a-tabs default-active-key="1" @change="callbacktab" v-if="visible">
        <a-tab-pane key="1" tab="基本信息">
          <!-- <add-form ref="addFormRef" @ok="handleOk" /> -->
          <!-- 基本信息  layout="inline"  layout="vertical" -->
@@ -28,7 +29,8 @@
            </a-form-item> -->

            <a-form-item label="物料类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-select style="width: 100%" placeholder="请选择物料类型" v-decorator="['materialType', { rules: [{ required: true, message: '请选择物料类型！' }] }]">
              <a-select style="width: 100%" placeholder="请选择物料类型"
                v-decorator="['materialType', { rules: [{ required: true, message: '请选择物料类型！' }] }]">
                <a-select-option v-for="(item, index) in materialTypeData" :key="index" :value="item.id">{{
                  item.materialTypeName }}</a-select-option>
              </a-select>
@@ -104,17 +106,18 @@
            <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
          </a-form>
        </a-tab-pane>
        <!-- force-render 很重要 不然ref实例获取不到 -->
        <a-tab-pane key="2" tab="控制属性" force-render>
          <add-control-rule v-if="visible" ref="WmsControlRuleRef" />
          <add-control-rule ref="WmsControlRuleRef" />
        </a-tab-pane>
        <a-tab-pane key="3" tab="批次属性">
        <a-tab-pane key="3" tab="批次属性" force-render>
          需求待定
        </a-tab-pane>
        <a-tab-pane key="4" tab="替代品管理">
          <add-form-sub v-if="visible" ref="addFormWmsSubstituteGoodRef" />
        <a-tab-pane key="4" tab="替代品管理" force-render>
          <add-form-sub ref="addFormWmsSubstituteGoodRef" />
        </a-tab-pane>
        <a-tab-pane key="5" tab="往来单位">
          <add-form-base-customer v-if="visible" ref="addFormBaseCustomer" />
        <a-tab-pane key="5" tab="往来单位" force-render>
          <add-form-base-customer ref="addFormBaseCustomer" />
        </a-tab-pane>

        <!-- <a-tab-pane key="6" tab="包装关系">
@@ -122,6 +125,12 @@
        </a-tab-pane> -->
      </a-tabs>
    </a-spin>

    <div style="text-align: right;">
      <a-button @click="handleCancel">职消</a-button>
      <a-button v-if="title != '详情物料信息详情'" type="primary" @click="handleSubmit">确定</a-button>
    </div>

  </a-modal>
</template>

@@ -212,7 +221,7 @@
        this.$nextTick(() => {
          // let materialCode = this.form.getFieldValue('materialCode');
          // let materialName = this.form.getFieldValue('materialName');
          this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
          // this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
        })
      }
    },
@@ -231,23 +240,22 @@
            ...record
          })
        })
        this.confirmLoading = true
        WmsMaterialDetailList({
          id: record.id
        })
          .then(res => {
            if (res.success) {

              console.log(res)
              this.$nextTick(() => {
                this.$refs.addFormWmsSubstituteGoodRef.list = res.data.substituteGoodList || []
                this.$refs.addFormBaseCustomer.list = res.data.baseCustomerList || []
                if (res.data.controlRuleDetailList && res.data.controlRuleDetailList.length > 0) {
                  this.$refs.WmsControlRuleRef.form.setFieldsValue({
                    ...res.data.controlRuleDetailList[0]
                  })
                }
                this.$refs.addFormWmsSubstituteGoodRef.list = res.data.substituteGoodList || []
                this.$refs.addFormBaseCustomer.list = res.data.baseCustomerList || []
              })

              })
            } else {
              this.$message.error('详情失败：' + JSON.stringify(res.message))
            }

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

@@ -220,6 +220,10 @@
    onClose() {
      this.close()
    },
    setData(data){
      alert(1)
      this.list = data;
    },
    close() {
      this.$emit('update:visible', false)
    },

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

@@ -696,14 +696,14 @@
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                                'min-width': '180px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                                'min-width': '180px'//最小列宽设置
                            }
                        }
                    },
@@ -1037,14 +1037,14 @@
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '80px'//最小列宽设置
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '80px'//最小列宽设置
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
@@ -1057,14 +1057,14 @@
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '80px'//最小列宽设置
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '80px'//最小列宽设置
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },