工厂模型修改

qushaowei

2023-10-07 d1c021fb4ebce99ca36ad877ae6633de995b91b5

工厂模型修改

 src/views/eam/SiteAreaLineManager.vue

@@ -26,7 +26,7 @@
  components: { SiteAreaLineManagerLeft, SiteAreaLineManagerRight },
  data() {
    return {
      description: '工厂/车间/建模建模'
      description: '工厂/工区/工段建模'
    }
  },
  methods: {}

 src/views/eam/modules/site/AreaList.vue

@@ -8,7 +8,7 @@
        class="action-jeecg actionarea1"
        style="font-size: 18px;"
      />
      车间
      工区
    </template>
    <!-- 查询区域 -->
    <div class="table-page-search-wrapper">
@@ -23,12 +23,12 @@
            :sm="8"
          >
            <a-form-item
              label="车间编号"
              label="工区编号"
              :labelCol="{span: 5}"
              :wrapperCol="{span: 18, offset: 1}"
            >
              <j-input
                placeholder="请输入车间编号查询"
                placeholder="请输入工区编号查询"
                v-model="queryParam.num"
              ></j-input>
            </a-form-item>
@@ -38,12 +38,12 @@
            :sm="8"
          >
            <a-form-item
              label="车间名称"
              label="工区名称"
              :labelCol="{span: 5}"
              :wrapperCol="{span: 18, offset: 1}"
            >
              <j-input
                placeholder="请输入车间名称查询"
                placeholder="请输入工区名称查询"
                v-model="queryParam.name"
              ></j-input>
            </a-form-item>
@@ -160,6 +160,16 @@
          :length="15"
        />
      </span>
      <span
        slot="teamNames"
        slot-scope="text"
      >
        <j-ellipsis
          :value="text"
          :length="15"
        />
      </span>

      <!--状态栏个性展示-->
      <span
        slot="status"
@@ -282,17 +292,24 @@
          }
        },
        {
          title: '车间编号',
          title: '工区编号',
          align: "center",
          dataIndex: 'num',
          sorter: true,
        },
        {
          title: '车间名称',
          title: '工区名称',
          dataIndex: 'name',
          align: "center",
          sorter: true,
        },
        {
          title: '维修班组',
          dataIndex: 'teamNames',
          align: "center",
          sorter: true,
          scopedSlots: { customRender: 'teamNames' },
        },
        // {
        //   title: '部门',
        //   align: 'center',

 src/views/eam/modules/site/AreaModel.vue

@@ -16,14 +16,14 @@
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item
              label="车间编号"
              label="工区编号"
              :labelCol="{span:4}"
              :wrapperCol="{span:18}"
            >
              <a-input
                :readOnly="disableSubmit"
                allow-clear
                placeholder="请输入车间编号"
                placeholder="请输入工区编号"
                v-decorator="['num', validatorRules.num ]"
              />
            </a-form-item>
@@ -33,20 +33,36 @@
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item
              label="车间名称"
              label="工区名称"
              :labelCol="{span:4}"
              :wrapperCol="{span:18}"
            >
              <a-input
                :readOnly="disableSubmit"
                allow-clear
                placeholder="请输入车间名称"
                placeholder="请输入工区名称"
                v-decorator="['name', validatorRules.name ]"
              />
            </a-form-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item
              label="维修班组"
              :labelCol="{span:4}"
              :wrapperCol="{span:18}"
            >
              <j-multi-select-tag
                :disabled="disableSubmit"
                placeholder="请选择维修班组"
                v-decorator="['teamId', validatorRules.teamId ]"
                dictCode="mom_base_team,name,id,status!='0' and del_flag!='1' order by num asc"
              >
              </j-multi-select-tag>
            </a-form-item>
          </a-col>
        </a-row>
        <!-- <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item
@@ -118,14 +134,14 @@
      validatorRules: {
        num: {
          rules: [
            { required: true, message: '请输入车间编号!' },
            { required: true, message: '请输入工区编号!' },
            { min: 0, max: 30, message: '长度不超过 30 个字符', trigger: 'blur' },
            { validator: this.validateNum },
          ]
        },
        name: {
          rules: [
            { required: true, message: '请输入车间名称!' },
            { required: true, message: '请输入工区名称!' },
            { min: 0, max: 64, message: '长度不超过 64 个字符', trigger: 'blur' },
            { validator: this.validateName },
          ]
@@ -162,7 +178,7 @@
      this.visible = true;
      this.disableSubmit = false;
      this.$nextTick(() => {
        this.form.setFieldsValue(pick(this.model, 'num', 'name', 'deptId', 'remark'))
        this.form.setFieldsValue(pick(this.model, 'num', 'name', 'teamId', 'deptId', 'remark'))
      });
    },
    close() {

 src/views/eam/modules/site/ProductionLineList.vue

@@ -8,7 +8,7 @@
        class="action-jeecg actionline1"
        style="font-size: 18px;"
      />
      产线
      工段
    </template>
    <!-- 查询区域 -->
    <div class="table-page-search-wrapper">
@@ -23,12 +23,12 @@
            :sm="8"
          >
            <a-form-item
              label="产线编号"
              label="工段编号"
              :labelCol="{span: 5}"
              :wrapperCol="{span: 18, offset: 1}"
            >
              <j-input
                placeholder="请输入产线编号查询"
                placeholder="请输入工段编号查询"
                v-model="queryParam.num"
              ></j-input>
            </a-form-item>
@@ -38,12 +38,12 @@
            :sm="8"
          >
            <a-form-item
              label="产线名称"
              label="工段名称"
              :labelCol="{span: 5}"
              :wrapperCol="{span: 18, offset: 1}"
            >
              <j-input
                placeholder="请输入产线名称查询"
                placeholder="请输入工段名称查询"
                v-model="queryParam.name"
              ></j-input>
            </a-form-item>
@@ -238,13 +238,13 @@
          }
        },
        {
          title: '产线编号',
          title: '工段编号',
          align: "center",
          dataIndex: 'num',
          sorter: true,
        },
        {
          title: '产线名称',
          title: '工段名称',
          dataIndex: 'name',
          align: "center",
          key: 'name',

 src/views/eam/modules/site/ProductionLineModel.vue

@@ -16,14 +16,14 @@
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item
              label="产线编号"
              label="工段编号"
              :labelCol="{span:4}"
              :wrapperCol="{span:18}"
            >
              <a-input
                :readOnly="disableSubmit"
                allow-clear
                placeholder="请输入产线编号"
                placeholder="请输入工段编号"
                v-decorator="['num', validatorRules.num ]"
              />
            </a-form-item>
@@ -33,14 +33,14 @@
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item
              label="产线名称"
              label="工段名称"
              :labelCol="{span:4}"
              :wrapperCol="{span:18}"
            >
              <a-input
                :readOnly="disableSubmit"
                allow-clear
                placeholder="请输入产线名称"
                placeholder="请输入工段名称"
                v-decorator="['name', validatorRules.name ]"
              />
            </a-form-item>
@@ -118,14 +118,14 @@
      validatorRules: {
        num: {
          rules: [
            { required: true, message: '请输入产线编号!' },
            { required: true, message: '请输入工段编号!' },
            { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
            { validator: this.validateNum },
          ]
        },
        name: {
          rules: [
            { required: true, message: '请输入产线名称!' },
            { required: true, message: '请输入工段名称!' },
            { min: 0, max: 30, message: '长度不超过 30 个字符', trigger: 'blur' },
            { validator: this.validateName },
          ]

 src/views/eam/modules/site/SiteAreaLineManagerLeft.vue

@@ -2,7 +2,7 @@
  <a-card
    :loading="cardLoading"
    :bordered="false"
    title="工厂/车间/产线模型"
    title="工厂/工区/工段模型"
    style="height: 100%;"
  >
    <a-spin :spinning="loading">
@@ -48,7 +48,7 @@
      <a-input-search
        @search="handleSearch"
        style="width:100%;margin-top: 10px"
        placeholder="检索工厂/车间/产线"
        placeholder="检索工厂/工区/工段"
        allowClear
        v-model="searchInput"
        @change="handleChange"
@@ -90,7 +90,7 @@
          </Tooltip>
          <Tooltip
            placement="top"
            title="车间"
            title="工区"
          >
            <i
              v-if="type == 2"
@@ -100,7 +100,7 @@
          </Tooltip>
          <Tooltip
            placement="top"
            title="产线"
            title="工段"
          >
            <i
              v-if="type == 3"