设备台账修改

“linengliang”

2023-10-09 d50a87b08c23d068157878794ed0d5c563eb8135

设备台账修改

 src/views/eam/EquipmentListOfFilesCarousel.vue

@@ -436,7 +436,7 @@
      <a-tab-pane tab="设备精度" key="2" forceRender>
        <EquipmentPrecisionParametersList 
        :isOpen="isOpenPrecision"
        :mainId="selectedMainId" />
        :mainId="precisionParametersTemplateId" />
      </a-tab-pane>
      <a-tab-pane tab="设备文档" key="3" forceRender>
        <EquipmentDocumentList :mainId="selectedMainId" />
@@ -742,6 +742,7 @@
        equipmentProcessParametersMainId: '',
        equipmentDocumentMainId: '',
        equipmentPrecisionParametersMainId: '',
        precisionParametersTemplateId:'',
        isOpenPrecision:true,
        isOpenProcess:true,
        treeData: [],
@@ -790,10 +791,12 @@
      onSelectChange(selectedRowKeys, selectionRows) {
        if(selectedRowKeys.length==1){
          this.selectedMainId=selectedRowKeys[0]
          this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
          this.isOpenProcess = selectionRows[0].processParameters==1;
          this.isOpenPrecision = selectionRows[0].precisionParameters==1;
        }else{
          this.selectedMainId=''
          this.precisionParametersTemplateId = ''
        }
        this.selectedRowKeys = selectedRowKeys;
        this.selectionRows = selectionRows;

 src/views/eam/EquipmentListOfProduct.vue

@@ -436,7 +436,7 @@
      <a-tab-pane tab="设备精度" key="2" forceRender>
        <EquipmentPrecisionParametersList 
        :isOpen="isOpenPrecision"
        :mainId="selectedMainId" />
        :mainId="precisionParametersTemplateId" />
      </a-tab-pane>
      <a-tab-pane tab="设备文档" key="3" forceRender>
        <EquipmentDocumentList :mainId="selectedMainId" />
@@ -742,6 +742,7 @@
        equipmentProcessParametersMainId: '',
        equipmentDocumentMainId: '',
        equipmentPrecisionParametersMainId: '',
        precisionParametersTemplateId:'',
        isOpenPrecision:true,
        isOpenProcess:true,
        treeData: [],
@@ -790,10 +791,12 @@
      onSelectChange(selectedRowKeys, selectionRows) {
        if(selectedRowKeys.length==1){
          this.selectedMainId=selectedRowKeys[0]
          this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
          this.isOpenProcess = selectionRows[0].processParameters==1;
          this.isOpenPrecision = selectionRows[0].precisionParameters==1;
        }else{
          this.selectedMainId=''
          this.precisionParametersTemplateId = ''
        }
        this.selectedRowKeys = selectedRowKeys;
        this.selectionRows = selectionRows;

 src/views/eam/EquipmentListOfWeldingMachine.vue

@@ -436,7 +436,7 @@
      <a-tab-pane tab="设备精度" key="2" forceRender>
        <EquipmentPrecisionParametersList 
        :isOpen="isOpenPrecision"
        :mainId="selectedMainId" />
        :mainId="precisionParametersTemplateId" />
      </a-tab-pane>
      <a-tab-pane tab="设备文档" key="3" forceRender>
        <EquipmentDocumentList :mainId="selectedMainId" />
@@ -742,6 +742,7 @@
        equipmentProcessParametersMainId: '',
        equipmentDocumentMainId: '',
        equipmentPrecisionParametersMainId: '',
        precisionParametersTemplateId:'',
        isOpenPrecision:true,
        isOpenProcess:true,
        treeData: [],
@@ -790,10 +791,12 @@
      onSelectChange(selectedRowKeys, selectionRows) {
        if(selectedRowKeys.length==1){
          this.selectedMainId=selectedRowKeys[0]
          this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
          this.isOpenProcess = selectionRows[0].processParameters==1;
          this.isOpenPrecision = selectionRows[0].precisionParameters==1;
        }else{
          this.selectedMainId=''
          this.precisionParametersTemplateId = ''
        }
        this.selectedRowKeys = selectedRowKeys;
        this.selectionRows = selectionRows;

 src/views/eam/PrecisionParametersTemplateList.vue

@@ -32,6 +32,9 @@
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button @click="handleCopy" type="primary" icon="copy" :disabled="selectedRowKeys.length!=1">复制</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
                <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
    </div>

    <!-- table区域-begin -->
@@ -177,6 +180,7 @@
          list: "/eam/precisionParametersTemplate/list",
          delete: "/eam/precisionParametersTemplate/delete",
          deleteBatch: "/eam/precisionParametersTemplate/deleteBatch",
          importExcelUrl: "/eam/precisionParametersTemplate/importExcel",
        },
        dictOptions:{
        },
@@ -274,7 +278,12 @@
        record.num = '';
        this.handleEdit(record);
      }
    }
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      }
    },
  }
</script>
<style scoped>

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

@@ -129,7 +129,7 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="车间"
              label="工区"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="factoryModelId"
@@ -137,7 +137,7 @@
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请选择车间"
                placeholder="请选择工区"
                :triggerChange="true"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="model.factoryModelId"
@@ -305,14 +305,17 @@
              :wrapperCol="wrapperCol"
              prop="operatingSystem"
            >
              <a-input
                v-model="model.operatingSystem"
              <j-dict-select-tag
                allow-clear
                placeholder="是否有操作系统"
                :disabled="formDisabled"
                placeholder="请输入操作系统"
              ></a-input>
                :triggerChange="true"
                dictCode="operation_flag"
                v-model="model.operatingSystem"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
          <a-col :span="6" v-if="model.operatingSystem=='yes'">
            <a-form-model-item
              label="系统"
              :labelCol="labelCol"
@@ -966,6 +969,9 @@
        propertyStatus: [
          { required: true, message: '请选择资产状态!' },
        ],
        system:[
          { required: true, message: '请输入系统!' },
        ]
      },
      url: {
        add: "/eam/equipment/add",

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

@@ -143,7 +143,7 @@
          if(!this.mainId){
            this.clearList()
          }else{
            this.queryParam['equipmentId'] = val
            this.queryParam['precisionParametersTemplateId'] = val
            this.loadData(1);
          }
        }
@@ -156,78 +156,42 @@
        // 表头
        columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: "center",
          customRender: function (t, r, index) {
            return parseInt(index) + 1;
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:100,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
          },
        },
        {
          title: '精度参数编码',
          dataIndex: 'precisionParametersNum',
          align: "center",
          // width:250,
        },
        {
          title: '精度参数名称',
          dataIndex: 'precisionParametersName',
          align: "center",
          // width:250,
        },
        {
          title: '计量单位',
          dataIndex: 'precisionParametersUnitName',
          align: "center",
          // width:250,
        },
        {
          title: '上限值',
          dataIndex: 'upperLimit',
          align: "center",
          // scopedSlots: {
          //   customRender: 'upperLimit'
          // },
          // width:250,
        },
        {
          title: '下限值',
          dataIndex: 'lowerLimit',
          align: "center",
          // scopedSlots: {
          //   customRender: 'lowerLimit'
          // },
          // width:250,
        },
        {
          title: '实际精度值',
          dataIndex: 'actualValue',
          align: "center",
          // scopedSlots: {
          //   customRender: 'actualValue'
          // },
          // width:250,
        },
        {
          title: '备注',
          dataIndex: 'remark',
          align: "center",
        },
        // {
        //   title: '操作',
        //   dataIndex: 'action',
        //   width: 160,
        //   align: "center",
        //   // scopedSlots: {
        //   //   customRender: 'action'
        //   // },
        //   fixed: 'right',
        // },
          {
            title:'检验项目名称',
            align:"center",
            dataIndex: 'precisionParametersName',
            width:400
          },
          {
            title:'位置',
            align:"center",
            dataIndex: 'precisionParametersUda1',
            width:400
          },
          {
            title:'允差（mm）',
            align:"center",
            dataIndex: 'tolerance',
            width:400
          },
          {
            title:'实测值',
            align:"center",
            dataIndex: 'actualValue',
            width:400
          },
        ],
        url: {
          list: "/eam/equipmentPrecisionParameters/list",
          list: '/eam/precisionParametersTemplateDetail/listByPrecisionParametersTemplateId',
          edit: "/eam/equipmentPrecisionParameters/edit",
          submitBatch:"/eam/equipmentPrecisionParameters/submitBatch",
          // delete: "/new/equipment/deleteEquipmentPrecisionParameters",

 src/views/eam/modules/equipmentNew/serach/PrecisionParametersDetailList.vue

@@ -51,36 +51,34 @@
        total: 0
      },
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          align: "center",
          customRender: function (t, r, index) {
            return parseInt(index) + 1;
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:100,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
          },
          width: 50,
        },
        {
          title: '设备精度编码',
          align: 'center',
          dataIndex: 'precisionParametersNum',
        },
        {
          title: '设备精度名称',
          align: 'center',
          dataIndex: 'precisionParametersName',
        },
        {
          title: '计量单位',
          align: 'center',
          dataIndex: 'unit',
        },
        {
          title: '备注',
          align: 'center',
          dataIndex: 'remark',
        },
          {
            title:'检验项目名称',
            align:"center",
            dataIndex: 'precisionParametersName',
            width:200
          },
          {
            title:'位置',
            align:"center",
            dataIndex: 'precisionParametersUda1',
            width:200
          },
          {
            title:'允差（mm）',
            align:"center",
            dataIndex: 'tolerance',
            width:200
          },
      ],

      url: {

 src/views/eam/modules/equipmentNew/serach/PrecisionParametersTemplateList.vue

@@ -312,7 +312,7 @@
  overflow-y: hidden;
}

/deep/ .notshow {
 .notshow {
  display: none;
}

@@ -332,7 +332,7 @@
  color: #1890ff;
}

/deep/ .frozenRowClass {
 .frozenRowClass {
  color: #c9c9c9;
}
</style>