合并设备借出与归还流程，增加借出归还列表详情功能

zhaowei

昨天 8905bdd0a74c4bd6cabc206c36a299341488041e

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

@@ -127,6 +127,17 @@
                                 disabled/>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item prop="equipmentUse" label="设备用途">
              <j-dict-select-tag dict-code="equipment_use" v-model="model.equipmentUse"
                                 placeholder="请选择设备用途" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item prop="operator" label="操作工">
              <a-input :placeholder="disableSubmit?'':'请输入操作工'" v-model="model.operator" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 出厂信息
@@ -186,7 +197,7 @@
            <a-form-model-item prop="orgId" label="使用车间">
              <a-tree-select v-model="model.orgId"
                             style="width: 100%"
                             :tree-data="treeData"
                             :tree-data="treeDataAlias"
                             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                             placeholder="请选择使用车间"
                             allow-clear
@@ -197,8 +208,8 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item prop="equipmentManager" label="设备管理员">
              <j-search-select-tag  placeholder="请选择设备管理员" v-model="model.equipmentManager" dict="sys_user,realname, username, del_flag=0 and post='PCR0004' and status=1" :disabled="disableSubmit"/>
            <a-form-model-item prop="equipmentManager" label="设备责任人">
              <j-search-select-tag  placeholder="请选择设备责任人" v-model="model.equipmentManager" dict="sys_user,realname, username, del_flag=0 and post='PCR0004' and status=1" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -280,7 +291,7 @@
          { required: true, message: '请选择使用车间' }
        ],
        equipmentManager: [
          { required: true, message: '请选择设备管理员' }
          { required: true, message: '请选择设备责任人' }
        ],
        deviceType: [
          { required: false, message: '请选择设备类型' }
@@ -292,6 +303,7 @@
        loadProductionOptions:'/mdc/mdcProduction/loadProductionTreeOptions'
      },
      treeData: [],
      treeDataAlias: []
    }
  },
  created() {
@@ -353,11 +365,43 @@
      getAction(this.url.loadProductionOptions).then(res => {
        if (res.success) {
          this.treeData = [...res.result]
          this.treeDataAlias = this.deepCopyAndModify(res.result)
        }else {
          that.$message.warning(res.message)
        }
      })
    },
    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>