Merge remote-tracking branch 'origin/master'

zhaowei

2025-05-12 6b8a6b0591e97aa7d175c5f6c61d64534f038124

Merge remote-tracking branch 'origin/master'

 src/views/eam/equipment/EamEquipmentList.vue

@@ -43,7 +43,7 @@
              <a-form-item label="使用车间">
                <a-tree-select v-model="queryParam.orgId"
                               style="width: 100%"
                               :tree-data="treeData"
                               :tree-data="treeDataAlias"
                               :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                               placeholder="请选择使用车间"
                               allow-clear
@@ -127,15 +127,15 @@
        <span slot="mdcFlag" slot-scope="text">
          <lx-switch v-model="text" disabled checked-children="是" un-checked-children="否"/>
        </span>
        <span slot="processParametersFlag" slot-scope="text">
<!--        <span slot="processParametersFlag" slot-scope="text">
          <lx-switch v-model="text" disabled checked-children="有" un-checked-children="无"/>
        </span>
        <span slot="precisionParametersFlag" slot-scope="text">
        </span>-->
<!--        <span slot="precisionParametersFlag" slot-scope="text">
          <lx-switch v-model="text" disabled checked-children="有" un-checked-children="无"/>
        </span>
        <span slot="specialEquipment" slot-scope="text">
        </span>-->
<!--        <span slot="specialEquipment" slot-scope="text">
          <lx-switch v-model="text" disabled checked-children="是" un-checked-children="否"/>
        </span>
        </span>-->
        <span slot="action" slot-scope="text, record">
          <a @click.stop="handleEdit(record)">编辑</a>

@@ -389,42 +389,42 @@
            dataIndex: 'mdcFlag',
            scopedSlots: { customRender: 'mdcFlag' }
          },
          {
            title: '有无工艺参数',
            align: 'center',
            width: 120,
            dataIndex: 'processParametersFlag',
            scopedSlots: { customRender: 'processParametersFlag' }
          },
          {
            title: '有无精度参数',
            align: 'center',
            width: 120,
            dataIndex: 'precisionParametersFlag',
            scopedSlots: { customRender: 'precisionParametersFlag' }
          },
          {
            title: '是否为特种设备',
            align: 'center',
            width: 120,
            dataIndex: 'specialEquipment',
            scopedSlots: { customRender: 'specialEquipment' }
          },
          {
            title: '重量',
            align: 'center',
            dataIndex: 'equipmentWeight'
          },
          {
            title: '设备端口',
            align: 'center',
            dataIndex: 'equipmentPort'
          },
          {
            title: '坐标数量',
            align: 'center',
            dataIndex: 'coordinateNum'
          },
          // {
          //   title: '有无工艺参数',
          //   align: 'center',
          //   width: 120,
          //   dataIndex: 'processParametersFlag',
          //   scopedSlots: { customRender: 'processParametersFlag' }
          // },
          // {
          //   title: '有无精度参数',
          //   align: 'center',
          //   width: 120,
          //   dataIndex: 'precisionParametersFlag',
          //   scopedSlots: { customRender: 'precisionParametersFlag' }
          // },
          // {
          //   title: '是否为特种设备',
          //   align: 'center',
          //   width: 120,
          //   dataIndex: 'specialEquipment',
          //   scopedSlots: { customRender: 'specialEquipment' }
          // },
          // {
          //   title: '重量',
          //   align: 'center',
          //   dataIndex: 'equipmentWeight'
          // },
          // {
          //   title: '设备端口',
          //   align: 'center',
          //   dataIndex: 'equipmentPort'
          // },
          // {
          //   title: '坐标数量',
          //   align: 'center',
          //   dataIndex: 'coordinateNum'
          // },
          {
            title: '创建人',
            align: 'center',
@@ -474,7 +474,8 @@
        printedRows: [],
        activeTabKey: 1,
        appHomeUrl: '',
        currentTableRowRecord: {}
        currentTableRowRecord: {},
        treeDataAlias: [],
      }
    },
    computed: {
@@ -492,6 +493,8 @@
        getAction(this.url.loadProductionOptions).then(res => {
          if (res.success) {
            this.treeData = [...res.result]
            this.treeDataAlias = this.deepCopyAndModify(res.result)
            console.info('treeDataAlias====', this.treeDataAlias)
          } else {
            that.$message.warning(res.message)
          }
@@ -581,7 +584,38 @@
            this.appHomeUrl = res.result.settingValue
          }
        })
      }
      },
      deepCopyAndModify(arr) {
        // 如果当前元素不是数组或对象，直接返回
        if (!Array.isArray(arr) && typeof arr !== 'object' || arr === null || arr.length === 0) {
          return arr;
        }

        // 如果是数组，创建一个新数组并递归处理每个元素
        if (Array.isArray(arr)) {
          const newArray = [];
          for (let i = 0; i < arr.length; i++) {
            newArray.push(this.deepCopyAndModify(arr[i]));
          }
          return newArray;
        }

        // 如果是对象，创建一个新对象并递归处理每个属性
        const newObj = {};
        for (const key in arr) {
          if (arr.hasOwnProperty(key)) {
            if(key === 'selectable') {
              newObj[key] = true;
            } else if(key === 'children') {
              newObj[key] = this.deepCopyAndModify(arr[key]);
            }else {
              newObj[key] = arr[key];
            }

          }
        }
        return newObj;
      },
    }
  }
</script>

 src/views/eam/equipment/modules/EamEquipmentModal.vue

@@ -85,30 +85,6 @@
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item prop="equipmentWeight" label="重量">
              <a-input :placeholder="disableSubmit?'':'请输入重量'" v-model="model.equipmentWeight" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item prop="equipmentPort" label="设备端口">
              <a-input :placeholder="disableSubmit?'':'请输入设备端口'" v-model="model.equipmentPort" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item prop="coordinateNum" label="坐标数量">
              <a-input-number :placeholder="disableSubmit?'':'请输入坐标数量'" v-model="model.coordinateNum" style="width: 100%" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item prop="assetStatus" label="资产状态">
              <j-dict-select-tag dict-code="asset_status" v-model="model.assetStatus"
                                 disabled/>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 出厂信息
        </a-divider>

@@ -211,13 +187,9 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item prop="processParametersFlag" label="有无工艺参数">
              <lx-switch checked-children='有' un-checked-children='无' v-model="model.processParametersFlag" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item prop="precisionParametersFlag" label="有无精度参数">
              <lx-switch checked-children='有' un-checked-children='无' v-model="model.precisionParametersFlag" :disabled="disableSubmit"/>
            <a-form-model-item prop="assetStatus" label="资产状态">
              <j-dict-select-tag dict-code="asset_status" v-model="model.assetStatus"
                                 disabled/>
            </a-form-model-item>
          </a-col>
        </a-row>

 src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue

@@ -28,7 +28,13 @@
                                 v-model="queryParam.maintenanceStatus"/>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
          <a-col :xl="3" :lg="4" :md="8" :sm="24">
            <a-form-item label="抽检标记">
              <j-dict-select-tag placeholder="请选择抽检标记" dict-code="yn"
                                 v-model="queryParam.randomInspectionFlag"/>
            </a-form-item>
          </a-col>
          <a-col :xl="3" :lg="4" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>

 src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue

@@ -65,6 +65,11 @@
              <a-input v-model="tableRowRecord.operator_dictText" readOnly/>
            </a-form-model-item>
          </a-col>
          <a-col :span='span'>
            <a-form-model-item label="作业指导">
              <a-button  @click="handlePreview(tableRowRecord.referenceFile)" type="primary" icon="eye">预览</a-button>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row>
@@ -190,6 +195,8 @@
        </template>
      </a-form-model>
    </a-spin>

    <lx-file-preview ref="lxFilePreview" :fileUrl="fileUrl"></lx-file-preview>
  </j-modal>
</template>

@@ -309,7 +316,8 @@
        selectedRowKeys: [],
        disableSubmit: false,
        activeTabKey: '1',
        title: ''
        title: '',
        fileUrl: '',
      }
    },
    computed: {
@@ -414,10 +422,11 @@
        })
      },

      autoCompleteForm({ standardName, maintenancePeriod, standardCode }) {
      autoCompleteForm({ standardName, maintenancePeriod, standardCode, referenceFile }) {
        this.$set(this.tableRowRecord, 'standardName', standardName)
        this.$set(this.tableRowRecord, 'maintenancePeriod', maintenancePeriod)
        this.$set(this.tableRowRecord, 'standardCode', standardCode)
        this.$set(this.tableRowRecord, 'referenceFile', referenceFile)
      },

      // 批量选择所有点检结果
@@ -482,6 +491,19 @@
            })
        }
      },
      handlePreview: function (fileJson) {
        if(fileJson) {
          let obj = JSON.parse(fileJson)
          if(obj.filePath) {
            this.$refs.lxFilePreview.preview(obj.filePath);
          }else {
            that.$message.warning('没有上传操作指导图片')
          }
        }else {
          that.$message.warning('没有上传操作指导图片')
        }

      },
    }
  }
</script>

 src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue

@@ -164,7 +164,7 @@
                            :disabled="disableSubmit || finalAcceptanceDisable"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
            <a-col :span="6">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAcceptanceFilesResult"
                                 label="初验收附件">
                <lx-upload :returnUrl="false"
@@ -173,6 +173,17 @@
                           v-model="model.initialAcceptanceFilesResult"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="6">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="randomInspectionFlag"
                                 label="抽检标记">
                <lx-switch
                  checked-children='是'
                  un-checked-children='否'
                  v-model="model.randomInspectionFlag"
                  :disabled="disableSubmit || finalAcceptanceDisable"
                />
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>
        <div v-if="finalAcceptanceDisable">