e4e75a7312f5195144b105d59ac90f26e174d4ba..f8ea0c93a2c35e84d77d737301bb36f50b8aeebb
2 天以前 zhangherong
art: 物料出库
f8ea0c 对比 | 目录
2 天以前 zhangherong
art: 热处理外协入库、小内圈外协入库、物料调拨
9e1c79 对比 | 目录
2 天以前 zhangherong
art: 系统名称改动
1188ad 对比 | 目录
已修改10个文件
已删除2个文件
696 ■■■■ 文件已修改
public/index.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/layouts/TabLayout.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/page/GlobalFooter.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/tools/Logo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/base/modules/warehouse/WarehouseModel.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/lsw/LswMaterialInboundList.vue 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/lsw/LswMaterialInventoryList.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/lsw/LswMaterialOutboundList.vue 275 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/lsw/modules/LswMaterialInboundForm.vue 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/lsw/modules/LswMaterialOutboundForm.vue 191 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/lsw/modules/LswMaterialOutboundModal.vue 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/user/Login.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/index.html
@@ -5,7 +5,7 @@
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <meta name="viewport" content="width=device-width,initial-scale=1.0">
  <title>MDC智慧车间</title>
  <title>双林轴承智慧车间</title>
  <link rel="icon" href="<%= BASE_URL %>logo.png">
  <script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
  <style>
@@ -249,7 +249,7 @@
    <div id="loader"></div>
    <div class="loader-section section-left"></div>
    <div class="loader-section section-right"></div>
    <div class="load_title">正在加载MDC智慧车间,请耐心等待
    <div class="load_title">正在加载系统,请耐心等待
    </div>
  </div>
src/components/layouts/TabLayout.vue
@@ -183,7 +183,7 @@
       * @param title è¦ä¿®æ”¹çš„æ–°æ ‡é¢˜
       */
      changeTitle(title) {
        let projectTitle = "MDC智慧车间"
        let projectTitle = "双林轴承智慧车间"
        // é¦–页特殊处理
        if (this.$route.path === indexKey) {
          document.title = projectTitle
src/components/page/GlobalFooter.vue
@@ -3,7 +3,7 @@
    <div class="copyright">
      Copyright
      <a-icon type="copyright"/>
      2024 <span>2015-2025 çµç§€æ™ºèƒ½</span>
      2025 <span>2015-2025 çµç§€æ™ºèƒ½</span>
    </div>
  </div>
</template>
src/components/tools/Logo.vue
@@ -21,7 +21,7 @@
    props: {
      title: {
        type: String,
        default: 'MDC智慧车间',
        default: 'MES智慧车间',
        required: false
      },
      showTitle: {
src/views/base/modules/warehouse/WarehouseModel.vue
@@ -55,6 +55,7 @@
            >
              <j-dict-select-tag :disabled="disableSubmit" type="list" placeholder="请选择产线"
                                 v-model="model.factoryId"
                                 v-decorator="['factoryId', validatorRules.factoryId ]"
                                 dictCode="base_factory,factory_name,id,del_flag='0' and factory_category='3'" />
            </a-form-item>
          </a-col>
@@ -105,6 +106,11 @@
            { min: 0, max: 64, message: '长度不超过 64 ä¸ªå­—符', trigger: 'blur' },
            { validator: this.validateName }
          ]
        },
        factoryId: {
          rules: [
            { required: true, message: '请选择产线' },
          ]
        }
      },
      url: {
src/views/lsw/LswMaterialInboundList.vue
@@ -20,20 +20,26 @@
              <j-input placeholder="请输入物料编码" v-model="queryParam.materialNumber"></j-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="物料名称">
              <j-input placeholder="请输入物料名称" v-model="queryParam.materialName"></j-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="批次号">
              <j-input placeholder="请输入批次号" v-model="queryParam.batchNumber"></j-input>
            </a-form-item>
          </a-col>
          <template v-if="toggleSearchStatus">
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="物料名称">
                <j-input placeholder="请输入物料名称" v-model="queryParam.materialName"></j-input>
              </a-form-item>
            </a-col>
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="批次号">
                <j-input placeholder="请输入批次号" v-model="queryParam.batchNumber"></j-input>
              </a-form-item>
            </a-col>
          </template>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <a @click="handleToggleSearch" style="margin-left: 8px">
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
              </a>
            </span>
          </a-col>
        </a-row>
@@ -43,9 +49,9 @@
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button @click="handleAdd('HEAT_TREATMENT_INBOUND')" type="primary" icon="plus">热处理入库</a-button>
      <a-button @click="handleAdd('SMALL_INNER_RING')" type="primary" icon="plus">小内圈入库</a-button>
      <a-button @click="handleAdd('MATERIAL_INNER_TRANSFER')" type="primary" icon="plus">钢球调拨</a-button>
      <a-button @click="handleAdd('HEAT_TREATMENT_INBOUND')" type="primary" icon="plus">热处理外协入库</a-button>
      <a-button @click="handleAdd('SMALL_INNER_RING')" type="primary" icon="plus">小内圈外协入库</a-button>
      <a-button @click="handleAdd('MATERIAL_INNER_TRANSFER')" type="primary" icon="plus">内部调拨</a-button>
    </div>
    <!-- table区域-begin -->
    <div>
@@ -66,11 +72,6 @@
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        class="j-table-force-nowrap"
        @change="handleTableChange">
        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>
          <a-divider type="vertical" />
          <a @click="handleDetail(record)">详情</a>
        </span>
      </a-table>
    </div>
@@ -149,21 +150,13 @@
          {
            title:'入库人',
            align:"center",
            dataIndex: 'receiver'
            dataIndex: 'receiver_dictText'
          },
          {
            title:'入库时间',
            align:"center",
            dataIndex: 'receiveTime'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' }
          }
        ],
        url: {
          list: "/lsw/materialInbound/list",
src/views/lsw/LswMaterialInventoryList.vue
@@ -77,6 +77,11 @@
          align: 'center',
          dataIndex: 'inventoryStatus_dictText'
        },
        {
          title: '热处理标记',
          align: 'center',
          dataIndex: 'warehouseId_dictText'
        },
      ],
      url: {
        list: '/lsw/materialInventory/list',
src/views/lsw/LswMaterialOutboundList.vue
@@ -5,24 +5,42 @@
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="线边库">
              <j-dict-select-tag placeholder="请选择线边库" v-model="queryParam.warehouseId"
                                 dictCode="base_line_side_warehouse,warehouse_name,id,del_flag=0 and warehouse_status='1'"></j-dict-select-tag>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="出库类型">
              <j-dict-select-tag placeholder="请选择出库类型" v-model="queryParam.outboundCategory"
                                 dictCode="material_outbound_category"></j-dict-select-tag>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="物料编码">
              <j-input placeholder="请输入物料编码" v-model="queryParam.materialNumber"></j-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="物料名称">
              <j-input placeholder="请输入物料名称" v-model="queryParam.materialName"></j-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="批次号">
              <j-input placeholder="请输入批次号" v-model="queryParam.batchNumber"></j-input>
            </a-form-item>
          </a-col>
          <template v-if="toggleSearchStatus">
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="物料名称">
                <j-input placeholder="请输入物料名称" v-model="queryParam.materialName"></j-input>
              </a-form-item>
            </a-col>
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="批次号">
                <j-input placeholder="请输入批次号" v-model="queryParam.batchNumber"></j-input>
              </a-form-item>
            </a-col>
          </template>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
              </a>
            </span>
          </a-col>
        </a-row>
@@ -30,21 +48,11 @@
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> æ‰¹é‡æ“ä½œ <a-icon type="down" /></a-button>
      </a-dropdown>
    </div>
    <!-- table区域-begin -->
    <div>
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a
        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>
@@ -61,169 +69,88 @@
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        class="j-table-force-nowrap"
        @change="handleTableChange">
        <template slot="htmlSlot" slot-scope="text">
          <div v-html="text"></div>
        </template>
        <template slot="imgSlot" slot-scope="text,record">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
        </template>
        <template slot="fileSlot" slot-scope="text">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button
            v-else
            :ghost="true"
            type="primary"
            icon="download"
            size="small"
            @click="downloadFile(text)">
            ä¸‹è½½
          </a-button>
        </template>
        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>
          <a-divider type="vertical" />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a @click="handleDetail(record)">详情</a>
              </a-menu-item>
              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
        </span>
      </a-table>
    </div>
    <lsw-material-outbound-modal ref="modalForm" @ok="modalFormOk"></lsw-material-outbound-modal>
  </a-card>
</template>
<script>
  import '@/assets/less/TableExpand.less'
  import { mixinDevice } from '@/utils/mixin'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import LswMaterialOutboundModal from './modules/LswMaterialOutboundModal'
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  export default {
    name: 'LswMaterialOutboundList',
    mixins:[JeecgListMixin, mixinDevice],
    components: {
      LswMaterialOutboundModal
    },
    data () {
      return {
        description: '物料出库单管理页面',
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
          },
          {
            title:'物料编码',
            align:"center",
            dataIndex: 'materialNumber'
          },
          {
            title:'物料名称',
            align:"center",
            dataIndex: 'materialName'
          },
          {
            title:'产线',
            align:"center",
            dataIndex: 'factoryId_dictText'
          },
          {
            title:'批次号',
            align:"center",
            dataIndex: 'batchNumber'
          },
          {
            title:'出库人',
            align:"center",
            dataIndex: 'outboundStaff'
          },
          {
            title:'出库时间',
            align:"center",
            dataIndex: 'outboundTime'
          },
          {
            title:'出库数量',
            align:"center",
            dataIndex: 'quantity'
          },
          {
            title:'工单',
            align:"center",
            dataIndex: 'workOrderId'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' }
export default {
  name: 'LswMaterialOutboundList',
  mixins: [JeecgListMixin, mixinDevice],
  components: {},
  data() {
    return {
      description: '物料出库单管理页面',
      // è¡¨å¤´
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        ],
        url: {
          list: "/lswmaterialoutbound/lswMaterialOutbound/list",
          delete: "/lswmaterialoutbound/lswMaterialOutbound/delete",
          deleteBatch: "/lswmaterialoutbound/lswMaterialOutbound/deleteBatch",
          exportXlsUrl: "/lswmaterialoutbound/lswMaterialOutbound/exportXls",
          importExcelUrl: "lswmaterialoutbound/lswMaterialOutbound/importExcel",
        },
        dictOptions:{},
        superFieldList:[],
      }
    },
    created() {
    this.getSuperFieldList();
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      },
    },
    methods: {
      initDictConfig(){
      },
      getSuperFieldList(){
        let fieldList=[];
        fieldList.push({type:'int',value:'delFlag',text:'删除标记',dictCode:''})
        fieldList.push({type:'string',value:'materialNumber',text:'物料编码',dictCode:''})
        fieldList.push({type:'string',value:'materialName',text:'物料名称',dictCode:''})
        fieldList.push({type:'string',value:'factoryId',text:'产线ID',dictCode:''})
        fieldList.push({type:'string',value:'batchNumber',text:'批次号',dictCode:''})
        fieldList.push({type:'string',value:'outboundStaff',text:'出库人',dictCode:''})
        fieldList.push({type:'datetime',value:'outboundTime',text:'出库时间'})
        fieldList.push({type:'string',value:'quantity',text:'出库数量',dictCode:''})
        fieldList.push({type:'string',value:'workOrderId',text:'工单ID',dictCode:''})
        this.superFieldList = fieldList
        {
          title: '线边库',
          align: 'center',
          dataIndex: 'warehouseId_dictText'
        },
        {
          title: '物料编码',
          align: 'center',
          dataIndex: 'materialNumber'
        },
        {
          title: '物料名称',
          align: 'center',
          dataIndex: 'materialName'
        },
        {
          title: '批次号',
          align: 'center',
          dataIndex: 'batchNumber'
        },
        {
          title: '出库类型',
          align: 'center',
          dataIndex: 'outboundCategory_dictText'
        },
        {
          title: '出库人',
          align: 'center',
          dataIndex: 'outboundStaff_dictText'
        },
        {
          title: '出库时间',
          align: 'center',
          dataIndex: 'outboundTime'
        },
        {
          title: '出库数量',
          align: 'center',
          dataIndex: 'quantity'
        }
      ],
      url: {
        list: '/lsw/materialOutbound/list'
      }
    }
  }
  },
  created() {
  },
  computed: {},
  methods: {}
}
</script>
<style scoped>
  @import '~@assets/less/common.less';
@import '~@assets/less/common.less';
</style>
src/views/lsw/modules/LswMaterialInboundForm.vue
@@ -4,8 +4,15 @@
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="来源编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="originalCode">
            <a-form-model-item label="来源编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="originalCode"
                               v-if="model.inboundCategory !== 'MATERIAL_INNER_TRANSFER'">
              <a-input v-model="model.originalCode" placeholder="请输入来源编码"></a-input>
            </a-form-model-item>
            <a-form-model-item label="来源线边库" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="originalCode"
                               v-else>
              <j-search-select-tag v-model="model.originalCode" placeholder="请选择线边库"
                                   :dict-options="originalCodeDictOptions"
                                   @change="originalCodeSelectChange"></j-search-select-tag>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@@ -16,12 +23,14 @@
          <a-col :span="12">
            <a-form-model-item label="线边库" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="warehouseId">
              <j-search-select-tag v-model="model.warehouseId" placeholder="请选择线边库"
                                   :dict-options="warehouseDictOptions" @change="warehouseSelectChange"></j-search-select-tag>
                                   :dict-options="warehouseDictOptions"
                                   @change="warehouseSelectChange"></j-search-select-tag>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialNumber">
              <j-search-select-tag :dict-options="materialDictOptions" v-model="model.materialNumber" placeholder="请选择物料编码" @change="materialSelectChange"></j-search-select-tag>
              <j-search-select-tag :dict-options="materialDictOptions" v-model="model.materialNumber"
                                   placeholder="请选择物料编码" @change="materialSelectChange"></j-search-select-tag>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@@ -47,7 +56,8 @@
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="入库类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inboundCategory">
              <j-search-select-tag v-model="model.inboundCategory" dict="material_inbound_category"></j-search-select-tag>
              <j-search-select-tag v-model="model.inboundCategory"
                                   dict="material_inbound_category"></j-search-select-tag>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -62,8 +72,7 @@
export default {
  name: 'LswMaterialInboundForm',
  components: {
  },
  components: {},
  props: {
    //表单禁用
    disabled: {
@@ -107,20 +116,27 @@
        ],
        quantity: [
          { required: true, message: '入库数量是必选项', trigger: 'change' }
        ],
        ]
      },
      url: {
        add: '/lsw/materialInbound/add',
        edit: '/lsw/materialInbound/edit',
        queryById: '/lsw/materialInbound/queryById',
        queryByProductionType: '/base/lineSideWarehouse/queryByProductionType',
        queryByMaterialCategory: '/lsw/lswMaterial/queryByMaterialCategory',
        queryByMaterialCategory: '/lsw/lswMaterial/queryByMaterialCategory'
      }
    }
  },
  computed: {
    formDisabled() {
      return this.disabled
    },
    originalCodeDictOptions() {
      return this.warehouseDictOptions.map(warehouse => ({
        ...warehouse,
        value: warehouse.warehouseCode,
        text: warehouse.warehouseName + '(' + warehouse.warehouseCode + ')'
      }))
    }
  },
  created() {
@@ -129,19 +145,19 @@
  },
  methods: {
    add(inboundCategory) {
      this.warehouseDictOptions = [];
      this.materialDictOptions = [];
      if(inboundCategory === 'HEAT_TREATMENT_INBOUND') {
        this.loadWarehouseDictOptions('OUTERFLANGE,INNERFLANGE');
        this.loadMaterialDictOptions('BLANK');
      }else if(inboundCategory === 'SMALL_INNER_RING') {
        this.loadWarehouseDictOptions('ASSEMBLE');
        this.loadMaterialDictOptions('SMALL_INNER_RING');
      } else if(inboundCategory === 'MATERIAL_INNER_TRANSFER') {
        this.loadWarehouseDictOptions('ASSEMBLE');
        this.loadMaterialDictOptions('STEEL_BALL');
      this.warehouseDictOptions = []
      this.materialDictOptions = []
      if (inboundCategory === 'HEAT_TREATMENT_INBOUND') {
        this.loadWarehouseDictOptions('OUTERFLANGE,INNERFLANGE')
        this.loadMaterialDictOptions('BLANK')
      } else if (inboundCategory === 'SMALL_INNER_RING') {
        this.loadWarehouseDictOptions('ASSEMBLE')
        this.loadMaterialDictOptions('SMALL_INNER_RING')
      } else if (inboundCategory === 'MATERIAL_INNER_TRANSFER') {
        this.loadWarehouseDictOptions('ASSEMBLE,OUTERFLANGE,INNERFLANG,HEATTREATMENT')
        this.loadMaterialDictOptions('OUTER_FLANGE,INNER_FLANGE,STEEL_BALL,BLANK,COMPONENTS')
      }
      this.modelDefault.inboundCategory = inboundCategory;
      this.modelDefault.inboundCategory = inboundCategory
      this.edit(this.modelDefault)
    },
    edit(record) {
@@ -178,35 +194,51 @@
      })
    },
    loadWarehouseDictOptions(productionType) {
      let params = {productionType : productionType}
      let params = { productionType: productionType }
      getAction(this.url.queryByProductionType, params).then(res => {
        if(res.success) {
          this.warehouseDictOptions = res.result.map(warehouse => ({...warehouse, value : warehouse.id, text: warehouse.warehouseName + '(' + warehouse.warehouseCode+')'}));
        if (res.success) {
          this.warehouseDictOptions = res.result.map(warehouse => ({
            ...warehouse,
            value: warehouse.id,
            text: warehouse.warehouseName + '(' + warehouse.warehouseCode + ')'
          }))
        }
      })
    },
    loadMaterialDictOptions(materialCategory) {
      let params = {materialCategory : materialCategory}
      let params = { materialCategory: materialCategory }
      getAction(this.url.queryByMaterialCategory, params).then(res => {
        if(res.success) {
          this.materialDictOptions = res.result.map(material => ({...material, value : material.materialNumber, text: material.materialNumber}));
        if (res.success) {
          this.materialDictOptions = res.result.map(material => ({
            ...material,
            value: material.materialNumber,
            text: material.materialNumber + '(' + material.materialName + ')'
          }))
        }
      })
    },
    warehouseSelectChange(value) {
      let warehouse = this.warehouseDictOptions.find(option => option.value === value)
      if(warehouse) {
      if (warehouse) {
        this.model.factoryId = warehouse.factoryId
      }else {
        this.model.factoryId = undefined;
      } else {
        this.model.factoryId = undefined
      }
    },
    materialSelectChange(value) {
      let material = this.materialDictOptions.find(option => option.value === value)
      if(material) {
      if (material) {
        this.model.materialName = material.materialName
      }else {
        this.model.materialName = undefined;
      } else {
        this.model.materialName = undefined
      }
    },
    originalCodeSelectChange(value) {
      let warehouse = this.originalCodeDictOptions.find(option => option.value === value)
      if (warehouse) {
        this.model.originalName = warehouse.warehouseName
      } else {
        this.model.originalName = undefined
      }
    }
  }
src/views/lsw/modules/LswMaterialOutboundForm.vue
ÎļþÒÑɾ³ý
src/views/lsw/modules/LswMaterialOutboundModal.vue
ÎļþÒÑɾ³ý
src/views/user/Login.vue
@@ -6,7 +6,7 @@
        <div class="header">
          <a href="/">
            <img src="~@/assets/lxzn.png" class="logo" alt="logo">
            <span class="title">MDC智慧车间</span>
            <span class="title">双林轴承智慧车间</span>
          </a>
        </div>
      </div>
@@ -62,10 +62,6 @@
          >确定
          </a-button>
        </a-form-item>
        <a-form-model-item style="color: red;font-size: 0.8vw">
          å¯†çº§ï¼šå†…部&nbsp;&nbsp;&nbsp;&nbsp;警告:本系统禁止存储、处理、传输涉密信息
        </a-form-model-item>
      </a-form-model>
    </div>