Merge remote-tracking branch 'origin/master'

zhangherong

12 小时以前 fcc3f96a76d35abc14210cfcaaf4d218fd194ad3

 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'}"
@@ -83,7 +86,7 @@
                </a-tree-select>
              </a-form-model-item>
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
                <a-input-number v-model="model.sorter"/>
                <a-input-number v-model="model.sorter" style="width:100%"/>
              </a-form-model-item>
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
                <a-textarea placeholder="请输入备注" v-model="model.remark"/>
@@ -163,7 +166,9 @@
          edges: []
        },
        validatorRules: {
          factoryName: [{ required: true, message: '请输入产线/车间名称!' }]
          factoryCode:[{ required: true, message: '请输入工厂/车间/产线编号!' }],
          factoryName:[{ required: true, message: '请输入工厂/车间/产线名称!' }],
          productionType:[{ required: false, message: '请选择产线类型!' }],
        },
        url: {
          delete: '/base/factory/delete',
@@ -180,7 +185,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() {
@@ -325,6 +350,7 @@
        this.setValuesToForm(record)
        if(record.factoryCategory == '3'){
          this.$refs.userFactory.show(record.id)
          this.validatorRules.productionType[0].required = true
        }else{
          this.$refs.userFactory.factoryId = ''
        }
@@ -396,7 +422,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)