工厂建模功能调整

cuijian

昨天 e8aebd4dd2b398a2a90c37e18336fafbb2c314a4

工厂建模功能调整

 src/views/base/FactoryManager.vue

@@ -5,8 +5,8 @@

        <!-- 按钮操作区域 -->
        <a-row style="margin-left: 14px">
          <a-button @click="handleAdd(1)" type="primary">添加车间</a-button>
          <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
          <a-button @click="handleAdd(1)" type="primary">添加工厂</a-button>
          <a-button v-if="this.factoryCategory == '1' || this.factoryCategory == '2'" @click="handleAdd(2)" type="primary">添加下级</a-button>
          <!-- <a-button type="primary" icon="download" @click="handleExportXls('车间信息')">导出</a-button>
          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
                    :action="importExcelUrl" @change="handleImportExcel">
@@ -66,13 +66,16 @@
        <a-tab-pane tab="基本信息" key="1">
          <a-card :bordered="false" v-if="selectedKeys.length>0">
            <a-form-model ref="form" :model="model" :rules="validatorRules">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryCode" label="车间编号">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryCode" :label="codeLabel">
                <a-input placeholder="请输入产线/车间编号" v-model="model.factoryCode"/>
              </a-form-model-item>
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryName" label="车间名称">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryName" :label="nameLabel">
                <a-input placeholder="请输入产线/车间名称" v-model="model.factoryName"/>
              </a-form-model-item>
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级车间">
              <a-form-model-item v-if="this.factoryCategory == '3'" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionType" :label="nameLabel">
                <j-dict-select-tag type="list" placeholder="请选择产线类型" v-model="model.productionType" dictCode="production_type"/>
              </a-form-model-item>
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="父节点">
                <a-tree-select
                  style="width:100%"
                  :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
@@ -180,7 +183,27 @@
    computed: {
      importExcelUrl: function() {
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
      }
      },
      // 新增计算属性：动态编号标签
    codeLabel() {
      if (!this.currSelected.factoryCategory) return "车间编号";
      const typeMap = {
        '1': '工厂编号',
        '2': '车间编号',
        '3': '产线编号'
      };
      return typeMap[this.currSelected.factoryCategory] || "车间编号";
    },
    // 新增计算属性：动态名称标签
    nameLabel() {
      if (!this.currSelected.factoryCategory) return "车间名称";
      const typeMap = {
        '1': '工厂名称',
        '2': '车间名称',
        '3': '产线名称'
      };
      return typeMap[this.currSelected.factoryCategory] || "车间名称";
    }
    },
    methods: {
      loadData() {
@@ -396,7 +419,7 @@
            })
            return false
          }
          this.$refs.departModal.add(this.selectedKeys)
          this.$refs.departModal.add(this.selectedKeys,this.factoryCategory)
          this.$refs.departModal.title = '新增'
        } else {
          this.$refs.departModal.add(this.currSelected)

 src/views/base/modules/factoryManager/FactoryModal.vue

@@ -16,28 +16,38 @@
        <a-form-model-item
          :labelCol="labelCol"
          :wrapperCol="wrapperCol"
          label="车间编码"
          :label="codeLabel"
          prop="factoryCode"
          :hidden="false"
          hasFeedback >
          <a-input id="factoryCode" placeholder="请输入产线/车间编号" v-model="model.factoryCode"/>
          <a-input id="factoryCode" placeholder="请输入工厂/产线/车间编号" v-model="model.factoryCode"/>
        </a-form-model-item>
        <a-form-model-item
          :labelCol="labelCol"
          :wrapperCol="wrapperCol"
          label="车间名称"
          :label="nameLabel"
          prop="factoryName"
          :hidden="false"
          hasFeedback >
          <a-input id="factoryName" placeholder="请输入产线/车间名称" v-model="model.factoryName"/>
          <a-input id="factoryName" placeholder="请输入工厂/产线/车间名称" v-model="model.factoryName"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="上级车间" hasFeedback>
        <a-form-model-item
          v-if="this.factoryCategory == '2'"
          :labelCol="labelCol"
          :wrapperCol="wrapperCol"
          label="产线类型"
          prop="productionType"
          :hidden="false"
          hasFeedback >
          <j-dict-select-tag type="list" placeholder="请选择产线类型" v-model="model.productionType" dictCode="production_type"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="父节点" hasFeedback>
          <a-tree-select
            style="width:100%"
            :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
            :treeData="factoryTree"
            v-model="model.parentId"
            placeholder="请选择上级车间"
            placeholder="请选择父节点"
            :disabled="condition">
          </a-tree-select>
        </a-form-model-item>
@@ -63,12 +73,14 @@
  import { httpAction } from '@/api/manage'
  import { queryById } from '@/api/api'
  import pick from 'lodash.pick'
import JDictSelectTag from '../../../../components/dict/JDictSelectTag.vue'
  export default {
    name: "FactoryModal",
    components: {  },
    components: {JDictSelectTag  },
    data () {
      return {
        factoryTree:[],
        factoryCategory:'',
        title:"操作",
        seen:false,
        visible: false,
@@ -86,7 +98,7 @@

        confirmLoading: false,
        validatorRules:{
          factoryName:[{ required: true, message: '请输入产线/车间名称!' }],
          factoryName:[{ required: true, message: '请输入工厂/车间/产线名称!' }],
        },
        url: {
          add: "/base/factory/add",
@@ -95,6 +107,28 @@
      }
    },
    created () {
    },
    computed: {
      // 新增计算属性：动态编号标签
    codeLabel() {
      if (!this.factoryCategory) return "工厂编号";
      const typeMap = {
        '1': '车间编号',
        '2': '产线编号',
        '3': '产线编号'
      };
      return typeMap[this.factoryCategory] || "工厂编号";
    },
    // 新增计算属性：动态名称标签
    nameLabel() {
      if (!this.factoryCategory) return "工厂名称";
      const typeMap = {
        '1': '车间名称',
        '2': '产线名称',
        '3': '产线名称'
      };
      return typeMap[this.factoryCategory] || "工厂名称";
    }
    },
    methods: {
      loadTreeData(){
@@ -110,7 +144,7 @@

        })
      },
      add (factory) {
      add (factory,factoryCategory) {
        if(factory){
          this.seen = false;
          this.dictDisabled = false;
@@ -118,13 +152,14 @@
          this.seen = true;
          this.dictDisabled = true;
        }
        this.edit(factory);
        this.edit(factory,factoryCategory);
      },
      edit (record) {
      edit (record,factoryCategory) {
        this.visible = true;
        this.model = Object.assign({}, this.defaultModel, record)
        this.loadTreeData();
        this.model.parentId = record!=null?record.toString():null;
        this.factoryCategory = factoryCategory
      },
      close () {
        this.$emit('close');

 src/views/base/modules/factoryManager/SelectUserModal.vue

@@ -34,7 +34,7 @@
      <!-- table区域-begin -->
      <div>
        <a-table
          size="small"
          size="middle"
          bordered
          rowKey="id"
          :columns="columns1"

 src/views/base/modules/group/SelectUserModal.vue

@@ -34,7 +34,7 @@
      <!-- table区域-begin -->
      <div>
        <a-table
          size="small"
          size="middle"
          bordered
          rowKey="id"
          :columns="columns1"

 src/views/system/modules/SelectUserModal.vue

@@ -33,7 +33,7 @@
      <!-- table区域-begin -->
      <div>
        <a-table
          size="small"
          size="middle"
          bordered
          rowKey="id"
          :columns="columns1"