修改

“linengliang”

2023-12-13 fd6e935f391501358357f3e6bc1957764510b8bc

修改

 src/views/eam/EquipmentListOfAll.vue

@@ -121,6 +121,21 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="是否生产线设备"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择"
                :triggerChange="true"
                dictCode="is_product"
                v-model="queryParam.isLineEquip"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
@@ -236,7 +251,7 @@

      <a-table
        ref="table"
        size="middle"
        size="small"
        bordered
        rowKey="id"
        :scroll="{x:true}"
@@ -523,6 +538,11 @@
          dataIndex: 'equipmentCategoryId_dictText',
        },
        {
          title: '是否生产线设备',
          align: "center",
          dataIndex: 'isLineEquip_dictText',
        },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'num',

 src/views/eam/EquipmentListOfCrane.vue

@@ -106,6 +106,21 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="是否生产线设备"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择"
                :triggerChange="true"
                dictCode="is_product"
                v-model="queryParam.isLineEquip"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
@@ -508,6 +523,11 @@
          dataIndex: 'equipmentCategoryId_dictText',
        },
        {
          title: '是否生产线设备',
          align: "center",
          dataIndex: 'isLineEquip_dictText',
        },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'num',

 src/views/eam/EquipmentListOfEnvProEquipment.vue

@@ -121,6 +121,21 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="是否生产线设备"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择"
                :triggerChange="true"
                dictCode="is_product"
                v-model="queryParam.isLineEquip"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
@@ -525,6 +540,11 @@
          align: "center",
          dataIndex: 'equipmentCategoryId_dictText',
        },
         {
          title: '是否生产线设备',
          align: "center",
          dataIndex: 'isLineEquip_dictText',
        },
        {
          title: '统一编码',
          align: "center",

 src/views/eam/EquipmentListOfFilesCarousel.vue

@@ -121,6 +121,21 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="是否生产线设备"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择"
                :triggerChange="true"
                dictCode="is_product"
                v-model="queryParam.isLineEquip"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
@@ -523,6 +538,11 @@
          dataIndex: 'equipmentCategoryId_dictText',
        },
        {
          title: '是否生产线设备',
          align: "center",
          dataIndex: 'isLineEquip_dictText',
        },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'num',

 src/views/eam/EquipmentListOfPressureVessel.vue

@@ -121,6 +121,21 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="是否生产线设备"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择"
                :triggerChange="true"
                dictCode="is_product"
                v-model="queryParam.isLineEquip"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
@@ -523,6 +538,11 @@
          dataIndex: 'equipmentCategoryId_dictText',
        },
        {
          title: '是否生产线设备',
          align: "center",
          dataIndex: 'isLineEquip_dictText',
        },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'num',

 src/views/eam/EquipmentListOfProduct.vue

@@ -121,6 +121,21 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="是否生产线设备"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择"
                :triggerChange="true"
                dictCode="is_product"
                v-model="queryParam.isLineEquip"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
@@ -523,6 +538,11 @@
          dataIndex: 'equipmentCategoryId_dictText',
        },
        {
          title: '是否生产线设备',
          align: "center",
          dataIndex: 'isLineEquip_dictText',
        },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'num',

 src/views/eam/EquipmentListOfRide.vue

@@ -121,6 +121,21 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="是否生产线设备"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择"
                :triggerChange="true"
                dictCode="is_product"
                v-model="queryParam.isLineEquip"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
@@ -523,6 +538,11 @@
          dataIndex: 'equipmentCategoryId_dictText',
        },
        {
          title: '是否生产线设备',
          align: "center",
          dataIndex: 'isLineEquip_dictText',
        },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'num',

 src/views/eam/EquipmentListOfTester.vue

@@ -121,6 +121,21 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="是否生产线设备"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择"
                :triggerChange="true"
                dictCode="is_product"
                v-model="queryParam.isLineEquip"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
@@ -523,6 +538,11 @@
          dataIndex: 'equipmentCategoryId_dictText',
        },
        {
          title: '是否生产线设备',
          align: "center",
          dataIndex: 'isLineEquip_dictText',
        },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'num',

 src/views/eam/EquipmentListOfTruck.vue

@@ -121,6 +121,21 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="是否生产线设备"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择"
                :triggerChange="true"
                dictCode="is_product"
                v-model="queryParam.isLineEquip"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
@@ -523,6 +538,11 @@
          dataIndex: 'equipmentCategoryId_dictText',
        },
        {
          title: '是否生产线设备',
          align: "center",
          dataIndex: 'isLineEquip_dictText',
        },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'num',

 src/views/eam/EquipmentListOfWeldingMachine.vue

@@ -121,6 +121,21 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="是否生产线设备"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择"
                :triggerChange="true"
                dictCode="is_product"
                v-model="queryParam.isLineEquip"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
@@ -523,6 +538,11 @@
          dataIndex: 'equipmentCategoryId_dictText',
        },
        {
          title: '是否生产线设备',
          align: "center",
          dataIndex: 'isLineEquip_dictText',
        },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'num',

 src/views/eam/EquipmentOfLine.vue

@@ -61,7 +61,7 @@
        @click="searchReset"
        icon="reload"
      >重置</a-button>
      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'equipmentAccount:add&delete&import&Edit'">新增</a-button>
      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'line:add&edit&delete'">新增</a-button>
      <!-- <a-button type="primary" icon="download" @click="handleExportXls('设备台账')" v-has="'equipmentAccount:outport'">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import"  v-has="'equipmentAccount:add&delete&import&Edit'">导入</a-button>
@@ -78,7 +78,7 @@

      <a-table
        ref="table"
        size="middle"
        size="small"
        bordered
        rowKey="id"
        :scroll="{x:true}"
@@ -119,20 +119,21 @@
        >详情</a>
        <a-divider type="vertical" />
        <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  v-has="'equipmentAccount:add&delete&import&Edit'">
            <a-menu-item  v-has="'line:add&edit&delete'">
             
            </a-menu-item>
            <a-menu-item>
              <a-popconfirm
                title="确定删除吗?"
                @confirm="() => handleDelete(record.id)"
                v-has="'equipmentAccount:add&delete&import&Edit'"
                v-has="'line:add&edit&delete'"
              >
                <a>删除</a>
              </a-popconfirm>
@@ -159,7 +160,7 @@
  import '@/assets/less/TableExpand.less'
  import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
  import EquipmentOfLineModal from './modules/line/EquipmentOfLineModal.vue'
  import EquipmentListOfLine from './modules/line/EquipmentListOfLine.vue'
  import EquipmentListOfLine from './modules/line/EquipmentListOfLine'
  export default {
    name: "EquipmentOfLine",
    mixins:[JeecgListMixin,mixinDevice],
@@ -188,16 +189,43 @@
          title: '生产线编码',
          align: "center",
          dataIndex: 'num',
          width: 200,
        },
        {
          title: '生产线名称',
          align: "center",
          dataIndex: 'name',
          width: 200,
        },
        {
          title: '使用部门',
          align: "center",
          dataIndex: 'useId_dictText',
          width: 150,
        },
        {
          title: '维护部门',
          align: "center",
          dataIndex: 'manageId_dictText',
          width: 150,
        },
        {
          title: '维修班组',
          align: "center",
          dataIndex: 'teamId_dictText',
          width: 150,
        },
        {
          title: '工区',
          align: "center",
          dataIndex: 'factoryModelId_dictText',
          width: 150,
        },
        {
          title: '设备总数',
          align: "center",
          dataIndex: 'sumOfEquipment',
          width: 150,
        },
        {
          title: '操作',
@@ -206,8 +234,7 @@
          scopedSlots: {
            customRender: 'action',
          },
          width: 147,
          fixed: 'right',
          width: 150,
        },
        ],
        url: {

 src/views/eam/FaultInfoList.vue

@@ -108,7 +108,7 @@
        </template>

        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)" v-if="record.isConfirm!=='yes'">录入</a>
          <a @click="handleEdit(record)" v-if="record.isConfirm!=='yes'" v-has="'fault:update'">录入</a>

          <a-divider type="vertical" />
          <a @click="handleDetail(record)">详情</a>
@@ -117,7 +117,7 @@
            title="确认结果后不可再录入，确认吗?"
            @confirm="() => handleConfirm(record)"
          >
            <a v-if="record.isConfirm!=='yes'">确认</a>
            <a v-if="record.isConfirm!=='yes'" v-has="'fault:confirm'">确认</a>
          </a-popconfirm>
        </span>


 src/views/eam/MalfunctionRepair.vue

@@ -193,6 +193,7 @@
        @click="handleAdd"
        type="primary"
        icon="plus"
        v-has="'report:add&edit'"
      >新增</a-button>
    </div>

@@ -218,6 +219,7 @@
          <a
            :disabled=" record.status !== '4'"
            @click="handleAccept(record)"
            v-has="'report:accept'"
          >验收</a>
          <!-- <a-popconfirm
            v-if="record.status == '1' || record.status == '4'"

 src/views/eam/QuanlityConfirmList.vue

@@ -118,7 +118,7 @@
        </template>

        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)" :disabled="record.isConfirm==='yes'">确认</a>
          <a @click="handleEdit(record)" :disabled="record.isConfirm==='yes'" v-has="'quanlity:confirm'">确认</a>

          <!-- <a-divider type="vertical" />
          <a-dropdown>

 src/views/eam/RepairOrderList.vue

@@ -229,6 +229,7 @@
          type="primary"
          icon="plus"
          @click="getReports"
          v-has="'repair:accept'"
      >领取</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">
@@ -332,6 +333,7 @@
          <a
            v-if="record.status === '2' || record.status === '3' "
            @click="handleOrderExe(record)"
            v-has="'repair:excute'"
          >执行</a>
          <a-divider
            v-if="record.status === '2' || record.status === '3' "

 src/views/eam/modules/equipmentNew/EquipmentModal.vue

@@ -151,6 +151,40 @@
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="是否生产线设备"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            prop="isLineEquip"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择"
                :triggerChange="true"
                :disabled="true"
                dictCode="is_product"
                v-model="model.isLineEquip"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="是否生产线"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            prop="isLine"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择"
                :triggerChange="true"
                :disabled="true"
                dictCode="is_product"
                v-model="model.isLine"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="设备图片"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
@@ -1025,7 +1059,6 @@
  },
  methods: {
    add() {
      this
      this.edit(this.modelDefault);
    },
    edit(record) {
@@ -1033,6 +1066,8 @@
      this.model = Object.assign({}, record);
      if (!this.model.id) {
        this.model.equipmentStatus = '1'
        this.model.isLineEquip = 'no'
        this.model.isLine = 'no'
      }
      this.visible = true;
    },

 src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue

@@ -178,7 +178,7 @@
      visible: false,
      loading: false,
      url: {
        list: '/eam/equipment/list'
        list: '/eam/equipment/getEquipmentList'
      }
    }
  },
@@ -208,6 +208,7 @@
      }
      let that = this
      this.loading = true
      this.queryParam.isLine = 'no'
      let params = this.getQueryParams()//查询条件
      // params.equipmentStatus = '1'
      await getAction(this.url.list, params).then((res) => {

 src/views/eam/modules/line/EquipmentOfLineForm.vue

@@ -49,6 +49,85 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="使用部门"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="useId"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请选择使用部门"
                :triggerChange="true"
                dictCode="sys_depart,depart_name,id,del_flag!='1'"
                v-model="model.useId"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item
              label="维护部门"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="manageId"
            >
              <!-- <a-tree-select
                :disabled="formDisabled"
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择维护部门"
                tree-default-expand-all
                v-model="model.manageId"
              /> -->
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请选择维护部门"
                :triggerChange="true"
                dictCode="sys_depart,depart_name,id,del_flag!='1'"
                v-model="model.manageId"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="teamId"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请选择责任班组"
                :triggerChange="true"
                dictCode="mom_base_team,name,id,status='1' and del_flag='0'"
                v-model="model.teamId"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="工区"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="factoryModelId"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请选择工区"
                :triggerChange="true"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="model.factoryModelId"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>
    </j-form-container>
@@ -65,7 +144,6 @@
          :disabled="formDisabled"
          :rowNumber="true"
          :rowSelection="true"
          :bordered="true"
          :alwaysEdit="true"
          :toolbar="true"
          @valueChange="changeDate"
@@ -125,11 +203,11 @@
        },
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
          sm: { span: 11 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
          sm: { span: 13 },
        },
        model:{
         },
@@ -145,7 +223,19 @@
        ],
        equipmentCategoryId:[
          { required: true, message: '请输入分类!' }
        ]
        ],
        manageId: [
          { required: true, message: '请选择维护部门!' },
        ],
        useId: [
          { required: true, message: '请选择使用部门!' },
        ],
        factoryModelId: [
          { required: true, message: '请选择工区!' },
        ],  
        teamId: [
          { required: true, message: '请选择责任班组!' },
        ],
        },
        refKeys: ['equipmentOfLineTable', ],
        tableKeys:['equipmentOfLineTable', ],

 src/views/eam/modules/malfunctionRepair/AcceptModel.vue

@@ -103,7 +103,6 @@
  },
  created() {
    //备份model原始值
    this.initOptions();
    this.modelDefault = JSON.parse(JSON.stringify(this.model));
  },
  methods: {

 src/views/eam/modules/malfunctionRepair/FaultDescriptionList.vue

@@ -95,7 +95,7 @@
      this.loading = true
      getAction(this.url.list, params)
        .then(res => {
          if (res.success) {
          if (res.success&&res.result!==null) {
            //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
            this.dataSource = res.result.records
            if (this.dataSource != null && this.dataSource != "") {